diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 00000000..b9fd1a34
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,3 @@
+{
+    "phabricator.uri": "https://git.kolab.org"
+}
diff --git a/.tx/config b/.tx/config
index e82c8bb8..53e3e4f9 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,8 +1,13 @@
 [main]
 host = https://www.transifex.com
-lang_map = en: en_US, de: de_DE, da: da_DK, es: es_ES, fi: fi_FI, fr: fr_FR, ja: ja_JP, nl: nl_NL, cs: cs_CZ, vi: vi_VN, pl: pl_PL, th: th_TH, sv: sv_SE, he: he_IL, hr: hr_HR, sk: sk_SK, sl: sl_SI, uk: uk_UA
+lang_map = en: en_US, de: de_DE, da: da_DK, es: es_ES, fi: fi_FI, fr: fr_FR, ja: ja_JP, nl: nl_NL, cs: cs_CZ, vi: vi_VN, th: th_TH, sv: sv_SE, he: he_IL, hr: hr_HR, sk: sk_SK, sl: sl_SI, uk: uk_UA
 type = PHP_ALT_ARRAY
 
+[kolab.kolab_2fa]
+file_filter = plugins/kolab_2fa/localization/<lang>.inc
+source_file = plugins/kolab_2fa/localization/en_US.inc
+source_lang = en_US
+
 [kolab.calendar]
 file_filter = plugins/calendar/localization/<lang>.inc
 source_file = plugins/calendar/localization/en_US.inc
@@ -71,6 +76,11 @@ file_filter = plugins/kolab_auth/localization/<lang>.inc
 source_file = plugins/kolab_auth/localization/en_US.inc
 source_lang = en_US
 
+[kolab.kolab_chat]
+file_filter = plugins/kolab_chat/localization/<lang>.inc
+source_file = plugins/kolab_chat/localization/en_US.inc
+source_lang = en_US
+
 [kolab.kolab_delegation]
 file_filter = plugins/kolab_delegation/localization/<lang>.inc
 source_file = plugins/kolab_delegation/localization/en_US.inc
@@ -91,16 +101,16 @@ file_filter = plugins/kolab_notes/localization/<lang>.inc
 source_file = plugins/kolab_notes/localization/en_US.inc
 source_lang = en_US
 
+[kolab.kolab_sso]
+file_filter = plugins/kolab_sso/localization/<lang>.inc
+source_file = plugins/kolab_sso/localization/en_US.inc
+source_lang = en_US
+
 [kolab.kolab_tags]
 file_filter = plugins/kolab_tags/localization/<lang>.inc
 source_file = plugins/kolab_tags/localization/en_US.inc
 source_lang = en_US
 
-[kolab.owncloud]
-file_filter = plugins/owncloud/localization/<lang>.inc
-source_file = plugins/owncloud/localization/en_US.inc
-source_lang = en_US
-
 [kolab.tasklist]
 file_filter = plugins/tasklist/localization/<lang>.inc
 source_file = plugins/tasklist/localization/en_US.inc
diff --git a/less-build.sh b/less-build.sh
new file mode 100755
index 00000000..08bbace5
--- /dev/null
+++ b/less-build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# First you have to link/copy /skins directory from Roundcube repo
+# into ./skins here
+
+# Note: You can remove -x option to generate non-minified file
+#       (remember to remove ".min" from the output file name)
+
+lessc --relative-urls -x plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css
diff --git a/plugins/calendar/.gitignore b/plugins/calendar/.gitignore
index 7c2f14c7..0074badf 100644
--- a/plugins/calendar/.gitignore
+++ b/plugins/calendar/.gitignore
@@ -3,6 +3,3 @@
 *.old
 *~
 config.inc.php
-skins/*
-!skins/default
-!skins/larry
\ No newline at end of file
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index e416ea7d..0ef2e8c0 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -58,9 +58,10 @@ class calendar extends rcube_plugin
     'calendar_itip_after_action'   => 0,
   );
 
-  private $ical;
-  private $itip;
-  private $driver;
+// These are implemented with __get()
+//  private $ical;
+//  private $itip;
+//  private $driver;
 
 
   /**
@@ -68,27 +69,13 @@ class calendar extends rcube_plugin
    */
   function init()
   {
-    $this->require_plugin('libcalendaring');
-
     $this->rc = rcube::get_instance();
-    $this->lib = libcalendaring::get_instance();
 
     $this->register_task('calendar', 'calendar');
 
     // load calendar configuration
     $this->load_config();
 
-    // load localizations
-    $this->add_texts('localization/', $this->rc->task == 'calendar' && (!$this->rc->action || $this->rc->action == 'print'));
-
-    $this->timezone = $this->lib->timezone;
-    $this->gmt_offset = $this->lib->gmt_offset;
-    $this->dst_active = $this->lib->dst_active;
-    $this->timezone_offset = $this->gmt_offset / 3600 - $this->dst_active;
-
-    require($this->home . '/lib/calendar_ui.php');
-    $this->ui = new calendar_ui($this);
-
     // catch iTIP confirmation requests that don're require a valid session
     if ($this->rc->action == 'attend' && !empty($_REQUEST['_t'])) {
       $this->add_hook('startup', array($this, 'itip_attend_response'));
@@ -96,7 +83,7 @@ class calendar extends rcube_plugin
     else if ($this->rc->action == 'feed' && !empty($_REQUEST['_cal'])) {
       $this->add_hook('startup', array($this, 'ical_feed_export'));
     }
-    else {
+    else if ($this->rc->task != 'login') {
       // default startup routine
       $this->add_hook('startup', array($this, 'startup'));
     }
@@ -104,6 +91,27 @@ class calendar extends rcube_plugin
     $this->add_hook('user_delete', array($this, 'user_delete'));
   }
 
+  /**
+   * Setup basic plugin environment and UI
+   */
+  protected function setup()
+  {
+    $this->require_plugin('libcalendaring');
+    $this->require_plugin('libkolab');
+
+    $this->lib             = libcalendaring::get_instance();
+    $this->timezone        = $this->lib->timezone;
+    $this->gmt_offset      = $this->lib->gmt_offset;
+    $this->dst_active      = $this->lib->dst_active;
+    $this->timezone_offset = $this->gmt_offset / 3600 - $this->dst_active;
+
+    // load localizations
+    $this->add_texts('localization/', $this->rc->task == 'calendar' && (!$this->rc->action || $this->rc->action == 'print'));
+
+    require($this->home . '/lib/calendar_ui.php');
+    $this->ui = new calendar_ui($this);
+  }
+
   /**
    * Startup hook
    */
@@ -113,6 +121,8 @@ class calendar extends rcube_plugin
     if ($this->rc->config->get('calendar_disabled', false) || !$this->rc->config->get('calendar_enabled', true))
         return;
 
+    $this->setup();
+
     // load Calendar user interface
     if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || $args['action'] == 'preview')) {
       $this->ui->init();
@@ -143,8 +153,7 @@ class calendar extends rcube_plugin
       $this->register_action('print', array($this,'print_view'));
       $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
       $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
-      $this->register_action('mailtoevent', array($this, 'mail_message2event'));
-      $this->register_action('inlineui', array($this, 'get_inline_ui'));
+      $this->register_action('dialog-ui', array($this, 'mail_message2event'));
       $this->register_action('check-recent', array($this, 'check_recent'));
       $this->register_action('itip-status', array($this, 'event_itip_status'));
       $this->register_action('itip-remove', array($this, 'event_itip_remove'));
@@ -179,7 +188,7 @@ class calendar extends rcube_plugin
       }
 
       // add 'Create event' item to message menu
-      if ($this->api->output->type == 'html') {
+      if ($this->api->output->type == 'html' && $_GET['_rel'] != 'event') {
         $this->api->add_content(html::tag('li', null, 
           $this->api->output->button(array(
             'command'  => 'calendar-create-from-mail',
@@ -260,11 +269,15 @@ class calendar extends rcube_plugin
   /**
    * Get properties of the calendar this user has specified as default
    */
-  public function get_default_calendar($sensitivity = null)
+  public function get_default_calendar($sensitivity = null, $calendars = null)
   {
+    if ($calendars === null) {
+      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE);
+    }
+
     $default_id = $this->rc->config->get('calendar_default_calendar');
-    $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE);
-    $calendar = $calendars[$default_id] ?: null;
+    $calendar   = $calendars[$default_id] ?: null;
+
     if (!$calendar || $sensitivity) {
       foreach ($calendars as $cal) {
         if ($sensitivity && $cal['subtype'] == $sensitivity) {
@@ -299,7 +312,6 @@ class calendar extends rcube_plugin
 
     $this->ui->init_templates();
     $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning','close');
-    $this->rc->output->add_label('libcalendaring.itipaccepted','libcalendaring.itiptentative','libcalendaring.itipdeclined','libcalendaring.itipdelegated','libcalendaring.expandattendeegroup','libcalendaring.expandattendeegroupnodata');
 
     // initialize attendees autocompletion
     $this->rc->autocomplete_init();
@@ -307,8 +319,11 @@ class calendar extends rcube_plugin
     $this->rc->output->set_env('timezone', $this->timezone->getName());
     $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
     $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
-    $this->rc->output->set_env('mscolors', jqueryui::get_color_values());
-    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list', 'aria-label' => $this->gettext('roleorganizer'))));
+    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array(
+        'id'         => 'edit-identities-list',
+        'aria-label' => $this->gettext('roleorganizer'),
+        'class'      => 'form-control custom-select',
+    )));
 
     $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
     if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
@@ -435,11 +450,16 @@ class calendar extends rcube_plugin
         return $p;
       }
 
-      $field_id = 'rcmfd_workstart';
+      $field_id   = 'rcmfd_workstart';
+      $work_start = $this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']);
+      $work_end   = $this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']);
       $p['blocks']['view']['options']['workinghours'] = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
-        'content' => $select_hours->show($this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']), array('name' => '_work_start', 'id' => $field_id)) .
-        ' &mdash; ' . $select_hours->show($this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']), array('name' => '_work_end', 'id' => $field_id)),
+        'title'   => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
+        'content' => html::div('input-group',
+          $select_hours->show($work_start, array('name' => '_work_start', 'id' => $field_id))
+          . html::span('input-group-append input-group-prepend', html::span('input-group-text',' &mdash; '))
+          . $select_hours->show($work_end, array('name' => '_work_end', 'id' => $field_id))
+        )
       );
     }
 
@@ -457,7 +477,7 @@ class calendar extends rcube_plugin
       $select_colors->add($this->gettext('coloringmode3'), 3);
 
       $p['blocks']['view']['options']['eventcolors'] = array(
-        'title' => html::label($field_id . 'value', rcube::Q($this->gettext('eventcoloring'))),
+        'title'   => html::label($field_id, rcube::Q($this->gettext('eventcoloring'))),
         'content' => $select_colors->show($this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring'])),
       );
     }
@@ -500,7 +520,7 @@ class calendar extends rcube_plugin
 
       $p['blocks']['view']['options']['alarmtype'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('defaultalarmtype'))),
-        'content' => $alarm_type . ' ' . $alarm_offset,
+        'content' => html::div('input-group', $alarm_type . ' ' . $alarm_offset),
       );
     }
 
@@ -510,19 +530,38 @@ class calendar extends rcube_plugin
         return $p;
       }
       // default calendar selection
-      $field_id = 'rcmfd_default_calendar';
+      $field_id   = 'rcmfd_default_calendar';
+      $filter     = calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE | calendar_driver::FILTER_INSERTABLE;
       $select_cal = new html_select(array('name' => '_default_calendar', 'id' => $field_id, 'is_escaped' => true));
-      foreach ((array)$this->driver->list_calendars(calendar_driver::FILTER_PERSONAL) as $id => $prop) {
+      foreach ((array)$this->driver->list_calendars($filter) as $id => $prop) {
         $select_cal->add($prop['name'], strval($id));
         if ($prop['default'])
           $default_calendar = $id;
       }
       $p['blocks']['view']['options']['defaultcalendar'] = array(
-        'title' => html::label($field_id . 'value', rcube::Q($this->gettext('defaultcalendar'))),
+        'title' => html::label($field_id, rcube::Q($this->gettext('defaultcalendar'))),
         'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', $default_calendar)),
       );
     }
 
+    if (!isset($no_override['calendar_show_weekno'])) {
+      if (!$p['current']) {
+        $p['blocks']['view']['content'] = true;
+        return $p;
+      }
+
+      $field_id   = 'rcmfd_show_weekno';
+      $select = new html_select(array('name' => '_show_weekno', 'id' => $field_id));
+      $select->add($this->gettext('weeknonone'), -1);
+      $select->add($this->gettext('weeknodatepicker'), 0);
+      $select->add($this->gettext('weeknoall'), 1);
+
+      $p['blocks']['view']['options']['show_weekno'] = array(
+        'title' => html::label($field_id, rcube::Q($this->gettext('showweekno'))),
+        'content' => $select->show(intval($this->rc->config->get('calendar_show_weekno'))),
+      );
+    }
+
     $p['blocks']['itip']['name'] = $this->gettext('itipoptions');
 
     // Invitations handling
@@ -559,7 +598,7 @@ class calendar extends rcube_plugin
 
       $p['blocks']['itip']['options']['after_action'] = array(
         'title'   => html::label($field_id, rcube::Q($this->gettext('afteraction'))),
-        'content' => $select->show($val) . $folders->show($folder),
+        'content' => html::div('input-group input-group-combo', $select->show($val) . $folders->show($folder)),
       );
     }
 
@@ -577,11 +616,17 @@ class calendar extends rcube_plugin
         foreach ($categories as $name => $color) {
           $key = md5($name);
           $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
-          $category_remove = new html_inputfield(array('type' => 'button', 'value' => 'X', 'class' => 'button', 'onclick' => '$(this).parent().remove()', 'title' => $this->gettext('remove_category')));
+          $category_remove = html::span('input-group-append', html::a(array(
+              'class'   => 'button icon delete input-group-text',
+              'onclick' => '$(this).parent().parent().remove()',
+              'title'   => $this->gettext('remove_category'),
+              'href'    => '#rcmfd_new_category',
+            ), html::span('inner', $this->gettext('delete'))
+          ));
           $category_name  = new html_inputfield(array('name' => "_categories[$key]", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable));
           $category_color = new html_inputfield(array('name' => "_colors[$key]", 'class' => "$field_class colors", 'size' => 6));
           $hidden = $this->driver->categoriesimmutable ? html::tag('input', array('type' => 'hidden', 'name' => "_categories[$key]", 'value' => $name)) : '';
-          $categories_list .= html::div(null, $hidden . $category_name->show($name) . '&nbsp;' . $category_color->show($color) . '&nbsp;' . $category_remove->show());
+          $categories_list .= $hidden . html::div('input-group', $category_name->show($name) . $category_color->show($color) . $category_remove);
         }
 
         $p['blocks']['categories']['options']['category_' . $name] = array(
@@ -590,24 +635,37 @@ class calendar extends rcube_plugin
 
         $field_id = 'rcmfd_new_category';
         $new_category = new html_inputfield(array('name' => '_new_category', 'id' => $field_id, 'size' => 30));
-        $add_category = new html_inputfield(array('type' => 'button', 'class' => 'button', 'value' => $this->gettext('add_category'),  'onclick' => "rcube_calendar_add_category()"));
+        $add_category = html::span('input-group-append', html::a(array(
+            'type'    => 'button',
+            'class'   => 'button create input-group-text',
+            'title'   => $this->gettext('add_category'),
+            'onclick' => 'rcube_calendar_add_category()',
+            'href'    => '#rcmfd_new_category',
+          ), html::span('inner', $this->gettext('add_category'))
+        ));
         $p['blocks']['categories']['options']['categories'] = array(
-          'content' => $new_category->show('') . '&nbsp;' . $add_category->show(),
+          'content' => html::div('input-group', $new_category->show('') . $add_category),
         );
 
-        $this->rc->output->add_script('function rcube_calendar_add_category(){
+        $this->rc->output->add_label('delete', 'calendar.remove_category');
+        $this->rc->output->add_script('function rcube_calendar_add_category() {
           var name = $("#rcmfd_new_category").val();
           if (name.length) {
-            var input = $("<input>").attr("type", "text").attr("name", "_categories[]").attr("size", 30).val(name);
-            var color = $("<input>").attr("type", "text").attr("name", "_colors[]").attr("size", 6).addClass("colors").val("000000");
-            var button = $("<input>").attr("type", "button").attr("value", "X").addClass("button").click(function(){ $(this).parent().remove() });
-            $("<div>").append(input).append("&nbsp;").append(color).append("&nbsp;").append(button).appendTo("#calendarcategories");
-            color.miniColors({ colorValues:(rcmail.env.mscolors || []) });
+            var button_label = rcmail.gettext("calendar.remove_category");
+            var input = $("<input>").attr({type: "text", name: "_categories[]", size: 30, "class": "form-control"}).val(name);
+            var color = $("<input>").attr({type: "text", name: "_colors[]", size: 6, "class": "colors form-control"}).val("000000");
+            var button = $("<a>").attr({"class": "button icon delete input-group-text", title: button_label, href: "#rcmfd_new_category"})
+              .click(function() { $(this).parent().parent().remove(); })
+              .append($("<span>").addClass("inner").text(rcmail.gettext("delete")));
+
+            $("<div>").addClass("input-group").append(input).append(color).append($("<span class=\'input-group-append\'>").append(button))
+              .appendTo("#calendarcategories");
+            color.minicolors(rcmail.env.minicolors_config || {});
             $("#rcmfd_new_category").val("");
           }
-        }');
+        }', 'foot');
 
-        $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event){
+        $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event) {
           if (event.which == 13) {
             rcube_calendar_add_category();
             event.preventDefault();
@@ -645,12 +703,12 @@ class calendar extends rcube_plugin
       $checkbox = new html_checkbox(array('name' => '_birthday_adressbooks[]') + $input_attrib);
       foreach ($this->rc->get_address_sources(false, true) as $source) {
         $active = in_array($source['id'], (array)$this->rc->config->get('calendar_birthday_adressbooks', array())) ? $source['id'] : '';
-        $sources[] = html::label(null, $checkbox->show($active, array('value' => $source['id'])) . '&nbsp;' . rcube::Q($source['realname'] ?: $source['name']));
+        $sources[] = html::tag('li', null, html::label(null, $checkbox->show($active, array('value' => $source['id'])) . rcube::Q($source['realname'] ?: $source['name'])));
       }
 
       $p['blocks']['birthdays']['options']['birthday_adressbooks'] = array(
         'title'   => rcube::Q($this->gettext('birthdayscalendarsources')),
-        'content' => join(html::br(), $sources),
+        'content' => html::tag('ul', 'proplist', implode("\n", $sources)),
       );
 
       $field_id = 'rcmfd_birthdays_alarm';
@@ -665,10 +723,12 @@ class calendar extends rcube_plugin
       foreach (array('-M','-H','-D') as $trigger)
         $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
 
-      $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+      $preset      = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+      $preset_type = $this->rc->config->get('calendar_birthdays_alarm_type', '');
+
       $p['blocks']['birthdays']['options']['birthdays_alarmoffset'] = array(
-        'title' => html::label($field_id . 'value', rcube::Q($this->gettext('showalarms'))),
-        'content' => $select_type->show($this->rc->config->get('calendar_birthdays_alarm_type', '')) . ' ' . $input_value->show($preset[0]) . '&nbsp;' . $select_offset->show($preset[1]),
+        'title'   => html::label($field_id, rcube::Q($this->gettext('showalarms'))),
+        'content' => html::div('input-group', $select_type->show($preset_type) . $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1])),
       );
     }
 
@@ -703,6 +763,7 @@ class calendar extends rcube_plugin
         'calendar_first_hour'   => intval(rcube_utils::get_input_value('_first_hour', rcube_utils::INPUT_POST)),
         'calendar_work_start'   => intval(rcube_utils::get_input_value('_work_start', rcube_utils::INPUT_POST)),
         'calendar_work_end'     => intval(rcube_utils::get_input_value('_work_end', rcube_utils::INPUT_POST)),
+        'calendar_show_weekno'  => intval(rcube_utils::get_input_value('_show_weekno', rcube_utils::INPUT_POST)),
         'calendar_event_coloring'       => intval(rcube_utils::get_input_value('_event_coloring', rcube_utils::INPUT_POST)),
         'calendar_default_alarm_type'   => rcube_utils::get_input_value('_alarm_type', rcube_utils::INPUT_POST),
         'calendar_default_alarm_offset' => $default_alarm,
@@ -731,6 +792,10 @@ class calendar extends rcube_plugin
         $colors     = (array) rcube_utils::get_input_value('_colors', rcube_utils::INPUT_POST);
 
         foreach ($categories as $key => $name) {
+          if (!isset($colors[$key])) {
+            continue;
+          }
+
           $color = preg_replace('/^#/', '', strval($colors[$key]));
 
           // rename categories in existing events -> driver's job
@@ -788,6 +853,22 @@ class calendar extends rcube_plugin
       case "subscribe":
         if (!$this->driver->subscribe_calendar($cal))
           $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
+        else {
+          $calendars = $this->driver->list_calendars();
+          $calendar  = $calendars[$cal['id']];
+
+          // find parent folder and check if it's a "user calendar"
+          // if it's also activated we need to refresh it (#5340)
+          while ($calendar['parent']) {
+            if (isset($calendars[$calendar['parent']]))
+              $calendar = $calendars[$calendar['parent']];
+            else
+              break;
+          }
+
+          if ($calendar['id'] != $cal['id'] && $calendar['active'] && $calendar['group'] == "other user")
+            $this->rc->output->command('plugin.refresh_source', $calendar['id']);
+        }
         return;
       case "search":
         $results    = array();
@@ -812,12 +893,12 @@ class calendar extends rcube_plugin
         }
         // report more results available
         if ($this->driver->search_more_results)
-          $this->rc->output->show_message('autocompletemore', 'info');
+          $this->rc->output->show_message('autocompletemore', 'notice');
 
         $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
         return;
     }
-    
+
     if ($success)
       $this->rc->output->show_message('successfullysaved', 'confirmation');
     else {
@@ -830,8 +911,8 @@ class calendar extends rcube_plugin
     if ($success && $reload)
       $this->rc->output->command('plugin.reload_view');
   }
-  
-  
+
+
   /**
    * Dispatcher for event actions initiated by the client
    */
@@ -840,7 +921,7 @@ class calendar extends rcube_plugin
     $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
     $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
     $success = $reload = $got_msg = false;
-    
+
     // force notify if hidden + active
     if ((int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']) === 1)
       $event['_notify'] = 1;
@@ -860,8 +941,10 @@ class calendar extends rcube_plugin
       case "new":
         // create UID for new event
         $event['uid'] = $this->generate_uid();
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->new_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->new_event($event)) {
           $event['id'] = $event['uid'];
           $event['_savemode'] = 'all';
           $this->cleanup_event($event);
@@ -871,8 +954,10 @@ class calendar extends rcube_plugin
         break;
         
       case "edit":
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->edit_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->edit_event($event)) {
           $this->cleanup_event($event);
           $this->event_save_success($event, $old, $action, $success);
         }
@@ -880,19 +965,23 @@ class calendar extends rcube_plugin
         break;
       
       case "resize":
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->resize_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->resize_event($event)) {
           $this->event_save_success($event, $old, $action, $success);
         }
         $reload = $event['_savemode'] ? 2 : 1;
         break;
       
       case "move":
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->move_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->move_event($event)) {
           $this->event_save_success($event, $old, $action, $success);
         }
-        $reload  = $success && $event['_savemode'] ? 2 : 1;
+        $reload = $success && $event['_savemode'] ? 2 : 1;
         break;
       
       case "remove":
@@ -991,6 +1080,7 @@ class calendar extends rcube_plugin
         $ev['attendees'] = $event['attendees'];
         $ev['free_busy'] = $event['free_busy'];
         $ev['_savemode'] = $event['_savemode'];
+        $ev['comment']   = $reply_comment;
 
         // send invitation to delegatee + add it as attendee
         if ($status == 'delegated' && $event['to']) {
@@ -1027,7 +1117,6 @@ class calendar extends rcube_plugin
           if (!$noreply) {
             $itip = $this->load_itip();
             $itip->set_sender_email($reply_sender);
-            $event['comment'] = $reply_comment;
             $event['thisandfuture'] = $event['_savemode'] == 'future';
             if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
               $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
@@ -1155,10 +1244,10 @@ class calendar extends rcube_plugin
     }
 
     // unlock client
-    $this->rc->output->command('plugin.unlock_saving');
+    $this->rc->output->command('plugin.unlock_saving', $success);
 
-    // update event object on the client or trigger a complete refretch if too complicated
-    if ($reload) {
+    // update event object on the client or trigger a complete refresh if too complicated
+    if ($reload && empty($_REQUEST['_framed'])) {
       $args = array('source' => $event['calendar']);
       if ($reload > 1)
         $args['refetch'] = true;
@@ -1505,11 +1594,11 @@ class calendar extends rcube_plugin
     }
     else {
       if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-        $msg = $this->gettext(array('name' => 'filesizeerror', 'vars' => array(
+        $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
             'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
       }
       else {
-        $msg = $this->gettext('fileuploaderror');
+        $msg = $this->rc->gettext('fileuploaderror');
       }
 
       $this->rc->output->command('plugin.import_error', array('message' => $msg));
@@ -1651,6 +1740,7 @@ class calendar extends rcube_plugin
 
     // sanity check user
     if ($this->rc->user->get_username() == $user) {
+      $this->setup();
       $this->load_driver();
       $this->export_events(false);
     }
@@ -1664,7 +1754,6 @@ class calendar extends rcube_plugin
     exit;
   }
 
-
   /**
    *
    */
@@ -1692,6 +1781,7 @@ class calendar extends rcube_plugin
     $settings['invite_shared'] = (int)$this->rc->config->get('calendar_allow_invite_shared', $this->defaults['calendar_allow_invite_shared']);
     $settings['invitation_calendars'] = (bool)$this->rc->config->get('kolab_invitation_calendars', false);
     $settings['itip_notify'] = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
+    $settings['show_weekno'] = (int)$this->rc->config->get('calendar_show_weekno', $this->defaults['calendar_show_weekno']);
 
     // get user identity to create default attendee
     if ($this->ui->screen == 'calendar') {
@@ -1705,6 +1795,18 @@ class calendar extends rcube_plugin
       $settings['identity'] = array('name' => $identity['name'], 'email' => strtolower($identity['email']), 'emails' => ';' . strtolower(join(';', $identity['emails'])));
     }
 
+    // freebusy token authentication URL
+    if (($url = $this->rc->config->get('calendar_freebusy_session_auth_url'))
+      && ($uniqueid = $this->rc->config->get('kolab_uniqueid'))
+    ) {
+      if ($url === true) $url = '/freebusy';
+      $url = rtrim(rcube_utils::resolve_url($url), '/ ');
+      $url .= '/' . urlencode($this->rc->get_user_name());
+      $url .= '/' . urlencode($uniqueid);
+
+      $settings['freebusy_url'] = $url;
+    }
+
     return $settings;
   }
 
@@ -1721,7 +1823,7 @@ class calendar extends rcube_plugin
     foreach ($events as $event) {
       $json[] = $this->_client_event($event, $addcss);
     }
-    return json_encode($json);
+    return rcube_output::json_serialize($json);
   }
 
   /**
@@ -1742,6 +1844,12 @@ class calendar extends rcube_plugin
 
     foreach ((array)$event['attachments'] as $k => $attachment) {
       $event['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
+
+      unset($event['attachments'][$k]['data'], $event['attachments'][$k]['content']);
+
+      if (!$attachment['id']) {
+        $event['attachments'][$k]['id'] = $k;
+      }
     }
 
     // convert link URIs references into structs
@@ -1873,7 +1981,8 @@ class calendar extends rcube_plugin
    */
   public function attachment_upload()
   {
-    $this->lib->attachment_upload(self::SESSION_KEY, 'cal-');
+    $handler = new kolab_attachments_handler();
+    $handler->attachment_upload(self::SESSION_KEY, 'cal-');
   }
 
   /**
@@ -1881,9 +1990,11 @@ class calendar extends rcube_plugin
    */
   public function attachment_get()
   {
+    $handler = new kolab_attachments_handler();
+
     // show loading page
     if (!empty($_GET['_preload'])) {
-        return $this->lib->attachment_loading_page();
+        return $handler->attachment_loading_page();
     }
 
     $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
@@ -1892,19 +2003,31 @@ class calendar extends rcube_plugin
     $rev      = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
 
     $event = array('id' => $event_id, 'calendar' => $calendar, 'rev' => $rev);
-    $attachment = $this->driver->get_attachment($id, $event);
+
+    if ($calendar == '--invitation--itip') {
+        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC);
+        $part = rcube_utils::get_input_value('_part', rcube_utils::INPUT_GPC);
+        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC);
+
+        $event      = $this->lib->mail_get_itip_object($mbox, $uid, $part, 'event');
+        $attachment = $event['attachments'][$id];
+        $attachment['body'] = &$attachment['data'];
+    }
+    else {
+        $attachment = $this->driver->get_attachment($id, $event);
+    }
 
     // show part page
     if (!empty($_GET['_frame'])) {
-        $this->lib->attachment = $attachment;
-        $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame'));
-        $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header'));
-        $this->rc->output->send('calendar.attachment');
+        $handler->attachment_page($attachment);
     }
     // deliver attachment content
     else if ($attachment) {
-        $attachment['body'] = $this->driver->get_attachment_body($id, $event);
-        $this->lib->attachment_get($attachment);
+        if ($calendar != '--invitation--itip') {
+            $attachment['body'] = $this->driver->get_attachment_body($id, $event);
+        }
+
+        $handler->attachment_get($attachment);
     }
 
     // if we arrive here, the requested part was not found
@@ -1926,19 +2049,42 @@ class calendar extends rcube_plugin
    */
   private function write_preprocess(&$event, $action)
   {
+    // Remove double timezone specification (T2313)
+    $event['start'] = preg_replace('/\s*\(.*\)/', '', $event['start']);
+    $event['end']   = preg_replace('/\s*\(.*\)/', '', $event['end']);
+
     // convert dates into DateTime objects in user's current timezone
-    $event['start'] = new DateTime($event['start'], $this->timezone);
-    $event['end'] = new DateTime($event['end'], $this->timezone);
+    $event['start']  = new DateTime($event['start'], $this->timezone);
+    $event['end']    = new DateTime($event['end'], $this->timezone);
     $event['allday'] = (bool)$event['allday'];
 
     // start/end is all we need for 'move' action (#1480)
     if ($action == 'move') {
-      return;
+      return true;
     }
 
     // convert the submitted recurrence settings
     if (is_array($event['recurrence'])) {
       $event['recurrence'] = $this->lib->from_client_recurrence($event['recurrence'], $event['start']);
+
+      // align start date with the first occurrence
+      if (!empty($event['recurrence']) && !empty($event['syncstart'])
+        && (empty($event['_savemode']) || $event['_savemode'] == 'all')
+      ) {
+        $next = $this->find_first_occurrence($event);
+
+        if (!$next) {
+          $this->rc->output->show_message('calendar.recurrenceerror', 'error');
+          return false;
+        }
+        else if ($event['start'] != $next) {
+          $diff = $event['start']->diff($event['end'], true);
+
+          $event['start'] = $next;
+          $event['end']   = clone $next;
+          $event['end']->add($diff);
+        }
+      }
     }
 
     // convert the submitted alarm values
@@ -1978,7 +2124,7 @@ class calendar extends rcube_plugin
       foreach ((array)$event['attendees'] as $i => $attendee) {
         if ($attendee['role'] == 'ORGANIZER')
           $organizer = $i;
-        if ($attendee['email'] == in_array(strtolower($attendee['email']), $emails))
+        if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails))
           $owner = $i;
         if (!isset($attendee['rsvp']))
           $event['attendees'][$i]['rsvp'] = true;
@@ -1986,17 +2132,28 @@ class calendar extends rcube_plugin
           $event['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1';
       }
 
+      if (!empty($event['_identity'])) {
+        $identity = $this->rc->user->get_identity($event['_identity']);
+      }
+
       // set new organizer identity
-      if ($organizer !== false && !empty($event['_identity']) && ($identity = $this->rc->user->get_identity($event['_identity']))) {
+      if ($organizer !== false && $identity) {
         $event['attendees'][$organizer]['name'] = $identity['name'];
         $event['attendees'][$organizer]['email'] = $identity['email'];
       }
-
       // set owner as organizer if yet missing
-      if ($organizer === false && $owner !== false) {
+      else if ($organizer === false && $owner !== false) {
         $event['attendees'][$owner]['role'] = 'ORGANIZER';
         unset($event['attendees'][$owner]['rsvp']);
       }
+      // fallback to the selected identity
+      else if ($organizer === false && $identity) {
+        $event['attendees'][] = array(
+          'role'  => 'ORGANIZER',
+          'name'  => $identity['name'],
+          'email' => $identity['email'],
+        );
+      }
     }
 
     // mapping url => vurl because of the fullcalendar client script
@@ -2004,6 +2161,8 @@ class calendar extends rcube_plugin
       $event['url'] = $event['vurl'];
       unset($event['vurl']);
     }
+
+    return true;
   }
 
   /**
@@ -2130,6 +2289,7 @@ class calendar extends rcube_plugin
     
     // if the backend has free-busy information
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
+
     if (is_array($fblist)) {
       $status = 'FREE';
       
@@ -2179,13 +2339,26 @@ class calendar extends rcube_plugin
       $dts = new DateTime('@'.$start);
       $dts->setTimezone($this->timezone);
     }
-    
+
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
-    $slots = array();
-    
+    $slots  = '';
+
+    // prepare freebusy list before use (for better performance)
+    if (is_array($fblist)) {
+      foreach ($fblist as $idx => $slot) {
+        list($from, $to, ) = $slot;
+
+        // check for possible all-day times
+        if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
+          // shift into the user's timezone for sane matching
+          $fblist[$idx][0] -= $this->gmt_offset;
+          $fblist[$idx][1] -= $this->gmt_offset;
+        }
+      }
+    }
+
     // build a list from $start till $end with blocks representing the fb-status
     for ($s = 0, $t = $start; $t <= $end; $s++) {
-      $status = self::FREEBUSY_UNKNOWN;
       $t_end = $t + $interval * 60;
       $dt = new DateTime('@'.$t);
       $dt->setTimezone($this->timezone);
@@ -2193,16 +2366,10 @@ class calendar extends rcube_plugin
       // determine attendee's status
       if (is_array($fblist)) {
         $status = self::FREEBUSY_FREE;
+
         foreach ($fblist as $slot) {
           list($from, $to, $type) = $slot;
 
-          // check for possible all-day times
-          if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
-              // shift into the user's timezone for sane matching
-              $from -= $this->gmt_offset;
-              $to   -= $this->gmt_offset;
-          }
-
           if ($from < $t_end && $to > $t) {
             $status = isset($type) ? $type : self::FREEBUSY_BUSY;
             if ($status == self::FREEBUSY_BUSY)  // can't get any worse :-)
@@ -2210,9 +2377,12 @@ class calendar extends rcube_plugin
           }
         }
       }
-      
-      $slots[$s] = $status;
-      $times[$s] = intval($dt->format($strformat));
+      else {
+        $status = self::FREEBUSY_UNKNOWN;
+      }
+
+      // use most compact format, assume $status is one digit/character
+      $slots .= $status;
       $t = $t_end;
     }
     
@@ -2222,13 +2392,12 @@ class calendar extends rcube_plugin
     // let this information be cached for 5min
     $this->rc->output->future_expire_header(300);
     
-    echo json_encode(array(
+    echo rcube_output::json_serialize(array(
       'email' => $email,
       'start' => $dts->format('c'),
       'end'   => $dte->format('c'),
       'interval' => $interval,
       'slots' => $slots,
-      'times' => $times,
     ));
     exit;
   }
@@ -2276,30 +2445,6 @@ class calendar extends rcube_plugin
     $this->rc->output->send("calendar.print");
   }
 
-  /**
-   *
-   */
-  public function get_inline_ui()
-  {
-    foreach (array('save','cancel','savingdata') as $label)
-      $texts['calendar.'.$label] = $this->gettext($label);
-    
-    $texts['calendar.new_event'] = $this->gettext('createfrommail');
-    
-    $this->ui->init_templates();
-    $this->ui->calendar_list();  # set env['calendars']
-    echo $this->api->output->parse('calendar.eventedit', false, false);
-    echo html::tag('script', array('type' => 'text/javascript'),
-      "rcmail.set_env('calendars', " . json_encode($this->api->output->env['calendars']) . ");\n".
-      "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n".
-      "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n".
-      "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n".
-      "rcmail.gui_object('attachmentlist', '"  . $this->ui->attachmentlist_id . "');\n".
-      "rcmail.add_label(" . json_encode($texts) . ");\n"
-    );
-    exit;
-  }
-
   /**
    * Compare two event objects and return differing properties
    *
@@ -2459,6 +2604,27 @@ class calendar extends rcube_plugin
 
   /****  Event invitation plugin hooks ****/
 
+  /**
+   * Find an event in user calendars
+   */
+  protected function find_event($event, &$mode)
+  {
+    $this->load_driver();
+
+    // We search for writeable calendars in personal namespace by default
+    $mode   = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
+    $result = $this->driver->get_event($event, $mode);
+    // ... now check shared folders if not found
+    if (!$result) {
+      $result = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_SHARED);
+      if ($result) {
+        $mode |= calendar_driver::FILTER_SHARED;
+      }
+    }
+
+    return $result;
+  }
+
   /**
    * Handler for calendar/itip-status requests
    */
@@ -2466,17 +2632,26 @@ class calendar extends rcube_plugin
   {
     $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
 
-    // find local copy of the referenced event
     $this->load_driver();
-    $existing = $this->driver->get_event($data, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL);
 
-    $itip = $this->load_itip();
-    $response = $itip->get_itip_status($data, $existing);
+    // find local copy of the referenced event (in personal namespace)
+    $existing  = $this->find_event($data, $mode);
+    $is_shared = $mode & calendar_driver::FILTER_SHARED;
+    $itip      = $this->load_itip();
+    $response  = $itip->get_itip_status($data, $existing);
 
     // get a list of writeable calendars to save new events to
-    if (!$existing && !$data['nosave'] && $response['action'] == 'rsvp' || $response['action'] == 'import') {
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
-      $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
+    if ((!$existing || $is_shared)
+      && !$data['nosave']
+      && ($response['action'] == 'rsvp' || $response['action'] == 'import')
+    ) {
+      $calendars       = $this->driver->list_calendars($mode);
+      $calendar_select = new html_select(array(
+          'name'       => 'calendar',
+          'id'         => 'itip-saveto',
+          'is_escaped' => true,
+          'class'      => 'form-control custom-select'
+      ));
       $calendar_select->add('--', '');
       $numcals = 0;
       foreach ($calendars as $calendar) {
@@ -2485,14 +2660,14 @@ class calendar extends rcube_plugin
           $numcals++;
         }
       }
-      if ($numcals <= 1)
+      if ($numcals < 1)
         $calendar_select = null;
     }
 
     if ($calendar_select) {
-      $default_calendar = $this->get_default_calendar($data['sensitivity']);
+      $default_calendar = $this->get_default_calendar($data['sensitivity'], $calendars);
       $response['select'] = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
-        $calendar_select->show($default_calendar['id']));
+        $calendar_select->show($is_shared ? $existing['calendar'] : $default_calendar['id']));
     }
     else if ($data['nosave']) {
       $response['select'] = html::tag('input', array('type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => ''));
@@ -2501,8 +2676,8 @@ class calendar extends rcube_plugin
     // render small agenda view for the respective day
     if ($data['method'] == 'REQUEST' && !empty($data['date']) && $response['action'] == 'rsvp') {
       $event_start = rcube_utils::anytodatetime($data['date']);
-      $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
-      $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
+      $day_start   = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
+      $day_end     = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
 
       // get events on that day from the user's personal calendars
       $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
@@ -2512,9 +2687,15 @@ class calendar extends rcube_plugin
       $before = $after = array();
       foreach ($events as $event) {
         // TODO: skip events with free_busy == 'free' ?
-        if ($event['uid'] == $data['uid'] || $event['end'] < $day_start || $event['start'] > $day_end)
+        if ($event['uid'] == $data['uid']
+            || $event['end'] < $day_start || $event['start'] > $day_end
+            || $event['status'] == 'CANCELLED'
+            || (!empty($event['className']) && strpos($event['className'], 'declined') !== false)
+        ) {
           continue;
-        else if ($event['start'] < $event_start)
+        }
+
+        if ($event['start'] < $event_start)
           $before[] = $this->mail_agenda_event_row($event);
         else
           $after[] = $this->mail_agenda_event_row($event);
@@ -2541,9 +2722,10 @@ class calendar extends rcube_plugin
     $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
     $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
     $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
+    $listmode = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
 
     // search for event if only UID is given
-    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), calendar_driver::FILTER_WRITEABLE)) {
+    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), $listmode)) {
       $event['_savemode'] = $savemode;
       $success = $this->driver->remove_event($event, true);
     }
@@ -2561,6 +2743,8 @@ class calendar extends rcube_plugin
    */
   public function itip_attend_response($p)
   {
+    $this->setup();
+
     if ($p['action'] == 'attend') {
       $this->ui->init();
 
@@ -2599,15 +2783,47 @@ class calendar extends rcube_plugin
             $this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
 
           // if user is logged in...
+          // FIXME: we should really consider removing this functionality
+          //        it's confusing that it creates/updates an event only for logged-in user
+          //        what if the logged-in user is not the same as the attendee?
           if ($this->rc->user->ID) {
             $this->load_driver();
+
             $invitation = $itip->get_invitation($token);
+            $existing   = $this->driver->get_event($this->event);
 
             // save the event to his/her default calendar if not yet present
-            if (!$this->driver->get_event($this->event) && ($calendar = $this->get_default_calendar($invitation['event']['sensitivity']))) {
+            if (!$existing && ($calendar = $this->get_default_calendar($invitation['event']['sensitivity']))) {
               $invitation['event']['calendar'] = $calendar['id'];
               if ($this->driver->new_event($invitation['event']))
                 $this->rc->output->command('display_message', $this->gettext(array('name' => 'importedsuccessfully', 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
+              else
+                $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
+            }
+            else if ($existing
+              && ($this->event['sequence'] >= $existing['sequence'] || $this->event['changed'] >= $existing['changed'])
+              && ($calendar = $this->driver->get_calendar($existing['calendar']))
+            ) {
+              $this->event       = $invitation['event'];
+              $this->event['id'] = $existing['id'];
+
+              unset($this->event['comment']);
+
+              // merge attendees status
+              // e.g. preserve my participant status for regular updates
+              $this->lib->merge_attendees($this->event, $existing, $status);
+
+              // update attachments list
+              $event['deleted_attachments'] = true;
+
+              // show me as free when declined (#1670)
+              if ($status == 'declined')
+                $this->event['free_busy'] = 'free';
+
+              if ($this->driver->edit_event($this->event))
+                $this->rc->output->command('display_message', $this->gettext(array('name' => 'updatedsuccessfully', 'vars' => array('calendar' => $calendar->get_name()))), 'confirmation');
+              else
+                $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
             }
           }
         }
@@ -2647,7 +2863,7 @@ class calendar extends rcube_plugin
       $this->rc->format_date($event['start'], $this->rc->config->get('time_format')) . ' - ' .
         $this->rc->format_date($event['end'], $this->rc->config->get('time_format'));
 
-    return html::div(rtrim('event-row ' . $class),
+    return html::div(rtrim('event-row ' . ($class ?: $event['className'])),
       html::span('event-date', $time) .
       html::span('event-title', rcube::Q($event['title']))
     );
@@ -2667,7 +2883,6 @@ class calendar extends rcube_plugin
         }
         else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
           // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
-
           if (!empty($header->structure) && is_array($header->structure->parts)) {
             foreach ($header->structure->parts as $part) {
               if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
@@ -2715,7 +2930,7 @@ class calendar extends rcube_plugin
             ) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
         }
 
-        $html .= html::div('calendar-invitebox',
+        $html .= html::div('calendar-invitebox invitebox boxinformation',
           $this->itip->mail_itip_inline_ui(
             $event,
             $ical_objects->method,
@@ -2774,17 +2989,17 @@ class calendar extends rcube_plugin
     $noreply = $noreply || $status == 'needs-action' || $itip_sending === 0;
     $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
     $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
+    $comment  = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
 
     $error_msg = $this->gettext('errorimportingevent');
-    $success = false;
-    $delegate = null;
+    $success   = false;
 
     if ($status == 'delegated') {
       $delegates = rcube_mime::decode_address_list(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true), 1, false);
       $delegate  = reset($delegates);
 
       if (empty($delegate) || empty($delegate['mailto'])) {
-        $this->rc->output->command('display_message', $this->gettext('libcalendaring.delegateinvalidaddress'), 'error');
+        $this->rc->output->command('display_message', $this->rc->gettext('libcalendaring.delegateinvalidaddress'), 'error');
         return;
       }
     }
@@ -2793,41 +3008,46 @@ class calendar extends rcube_plugin
     if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
       // forward iTip request to delegatee
       if ($delegate) {
-        $rsvpme  = (bool) intval(rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST));
-        $comment = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
+        $rsvpme = rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST);
+        $itip   = $this->load_itip();
 
-        $d_event = $comment ? array_merge($event, array('comment' => $comment)) : $event;
-        $itip    = $this->load_itip();
+        $event['comment'] = $comment;
 
-        if ($itip->delegate_to($d_event, $delegate, $rsvpme)) {
+        if ($itip->delegate_to($event, $delegate, !empty($rsvpme))) {
           $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
         }
         else {
           $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
         }
 
+        unset($event['comment']);
+
         // the delegator is set to non-participant, thus save as non-blocking
         $event['free_busy'] = 'free';
       }
 
+      $mode = calendar_driver::FILTER_PERSONAL
+        | calendar_driver::FILTER_SHARED
+        | calendar_driver::FILTER_WRITEABLE;
+
       // find writeable calendar to store event
-      $cal_id = !empty($_REQUEST['_folder']) ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
-      $dontsave = ($_REQUEST['_folder'] === '' && $event['_method'] == 'REQUEST');
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
-      $calendar = $calendars[$cal_id];
+      $cal_id    = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST);
+      $dontsave  = $cal_id === '' && $event['_method'] == 'REQUEST';
+      $calendars = $this->driver->list_calendars($mode);
+      $calendar  = $calendars[$cal_id];
 
       // select default calendar except user explicitly selected 'none'
       if (!$calendar && !$dontsave)
-         $calendar = $this->get_default_calendar($event['sensitivity']);
+         $calendar = $this->get_default_calendar($event['sensitivity'], $calendars);
 
       $metadata = array(
-        'uid' => $event['uid'],
+        'uid'       => $event['uid'],
         '_instance' => $event['_instance'],
-        'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0,
-        'sequence' => intval($event['sequence']),
-        'fallback' => strtoupper($status),
-        'method' => $event['_method'],
-        'task' => 'calendar',
+        'changed'   => is_object($event['changed']) ? $event['changed']->format('U') : 0,
+        'sequence'  => intval($event['sequence']),
+        'fallback'  => strtoupper($status),
+        'method'    => $event['_method'],
+        'task'      => 'calendar',
       );
 
       // update my attendee status according to submitted method
@@ -2854,9 +3074,9 @@ class calendar extends rcube_plugin
         if (!$reply_sender) {
           $sender_identity = $this->rc->user->list_emails(true);
           $event['attendees'][] = array(
-            'name' => $sender_identity['name'],
-            'email' => $sender_identity['email'],
-            'role' => 'OPT-PARTICIPANT',
+            'name'   => $sender_identity['name'],
+            'email'  => $sender_identity['email'],
+            'role'   => 'OPT-PARTICIPANT',
             'status' => strtoupper($status),
           );
           $metadata['attendee'] = $sender_identity['email'];
@@ -2866,42 +3086,53 @@ class calendar extends rcube_plugin
       // save to calendar
       if ($calendar && $calendar['editable']) {
         // check for existing event with the same UID
-        $existing = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL);
+        $existing = $this->find_event($event, $mode);
+
+        // we'll create a new copy if user decided to change the calendar
+        if ($existing && $cal_id && $calendar && $calendar['id'] != $existing['calendar']) {
+          $existing = null;
+        }
 
         if ($existing) {
+          $calendar = $calendars[$existing['calendar']];
+
           // forward savemode for correct updates of recurring events
           $existing['_savemode'] = $savemode ?: $event['_savemode'];
 
           // only update attendee status
           if ($event['_method'] == 'REPLY') {
             // try to identify the attendee using the email sender address
-            $existing_attendee = -1;
+            $existing_attendee        = -1;
             $existing_attendee_emails = array();
+
             foreach ($existing['attendees'] as $i => $attendee) {
               $existing_attendee_emails[] = $attendee['email'];
-              if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {
+              if ($this->itip->compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) {
                 $existing_attendee = $i;
               }
             }
-            $event_attendee = null;
+
+            $event_attendee   = null;
             $update_attendees = array();
+
             foreach ($event['attendees'] as $attendee) {
-              if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {
-                $event_attendee = $attendee;
-                $update_attendees[] = $attendee;
+              if ($this->itip->compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) {
+                $event_attendee       = $attendee;
+                $update_attendees[]   = $attendee;
                 $metadata['fallback'] = $attendee['status'];
                 $metadata['attendee'] = $attendee['email'];
-                $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
+                $metadata['rsvp']     = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
+
                 if ($attendee['status'] != 'DELEGATED') {
                   break;
                 }
               }
               // also copy delegate attendee
-              else if (!empty($attendee['delegated-from']) &&
-                       (stripos($attendee['delegated-from'], $event['_sender']) !== false ||
-                        stripos($attendee['delegated-from'], $event['_sender_utf']) !== false)) {
+              else if (!empty($attendee['delegated-from'])
+                && $this->itip->compare_email($attendee['delegated-from'], $event['_sender'], $event['_sender_utf'])
+              ) {
                 $update_attendees[] = $attendee;
-                if (!in_array($attendee['email'], $existing_attendee_emails)) {
+                if (!in_array_nocase($attendee['email'], $existing_attendee_emails)) {
                   $existing['attendees'][] = $attendee;
                 }
               }
@@ -2917,6 +3148,23 @@ class calendar extends rcube_plugin
               }
             }
 
+            // Accept sender as a new participant (different email in From: and the iTip)
+            // Use ATTENDEE entry from the iTip with replaced email address
+            if (!$event_attendee) {
+              // remove the organizer
+              $itip_attendees = array_filter($event['attendees'], function($item) { return $item['role'] != 'ORGANIZER'; });
+
+              // there must be only one attendee
+              if (is_array($itip_attendees) && count($itip_attendees) == 1) {
+                $event_attendee          = $itip_attendees[key($itip_attendees)];
+                $event_attendee['email'] = $event['_sender'];
+                $update_attendees[]      = $event_attendee;
+                $metadata['fallback']    = $event_attendee['status'];
+                $metadata['attendee']    = $event_attendee['email'];
+                $metadata['rsvp']        = $event_attendee['rsvp'] || $event_attendee['role'] != 'NON-PARTICIPANT';
+              }
+            }
+
             // found matching attendee entry in both existing and new events
             if ($existing_attendee >= 0 && $event_attendee) {
               $existing['attendees'][$existing_attendee] = $event_attendee;
@@ -2927,6 +3175,9 @@ class calendar extends rcube_plugin
               $existing['attendees'][] = $event_attendee;
               $success = $this->driver->update_attendees($existing, $update_attendees);
             }
+            else if (!$event_attendee) {
+              $error_msg = $this->gettext('errorunknownattendee');
+            }
             else {
               $error_msg = $this->gettext('newerversionexists');
             }
@@ -2941,24 +3192,20 @@ class calendar extends rcube_plugin
             $event['id'] = $existing['id'];
             $event['calendar'] = $existing['calendar'];
 
-            // preserve my participant status for regular updates
-            if (empty($status)) {
-              $emails = $this->get_user_emails();
-              foreach ($event['attendees'] as $i => $attendee) {
-                if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
-                  foreach ($existing['attendees'] as $j => $_attendee) {
-                    if ($attendee['email'] == $_attendee['email']) {
-                      $event['attendees'][$i] = $existing['attendees'][$j];
-                      break;
-                    }
-                  }
-                }
-              }
-            }
+            // merge attendees status
+            // e.g. preserve my participant status for regular updates
+            $this->lib->merge_attendees($event, $existing, $status);
 
             // set status=CANCELLED on CANCEL messages
             if ($event['_method'] == 'CANCEL')
               $event['status'] = 'CANCELLED';
+
+            // update attachments list, allow attachments update only on REQUEST (#5342)
+            if ($event['_method'] == 'REQUEST')
+              $event['deleted_attachments'] = true;
+            else
+              unset($event['attachments']);
+
             // show me as free when declined (#1670)
             if ($status == 'declined' || $event['status'] == 'CANCELLED' || $event_attendee['role'] == 'NON-PARTICIPANT')
               $event['free_busy'] = 'free';
@@ -3044,7 +3291,7 @@ class calendar extends rcube_plugin
 
     // send iTip reply
     if ($event['_method'] == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) {
-      $event['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
+      $event['comment'] = $comment;
       $itip = $this->load_itip();
       $itip->set_sender_email($reply_sender);
       if ($itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
@@ -3056,7 +3303,6 @@ class calendar extends rcube_plugin
     $this->rc->output->send();
   }
 
-
   /**
    * Handler for calendar/itip-remove requests
    */
@@ -3163,17 +3409,21 @@ class calendar extends rcube_plugin
    */
   public function mail_message2event()
   {
-    $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-    $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+    $this->ui->init();
+    $this->ui->addJS();
+    $this->ui->init_templates();
+    $this->ui->calendar_list(array(), true); // set env['calendars']
+
+    $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+    $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
     $event = array();
 
     // establish imap connection
-    $imap = $this->rc->get_storage();
-    $imap->set_folder($mbox);
-    $message = new rcube_message($uid);
+    $imap    = $this->rc->get_storage();
+    $message = new rcube_message($uid, $mbox);
 
     if ($message->headers) {
-      $event['title'] = trim($message->subject);
+      $event['title']       = trim($message->subject);
       $event['description'] = trim($message->first_text_part());
 
       $this->load_driver();
@@ -3215,14 +3465,14 @@ class calendar extends rcube_plugin
           }
         }
       }
-      
-      $this->rc->output->command('plugin.mail2event_dialog', $event);
+
+      $this->rc->output->set_env('event_prop', $event);
     }
     else {
       $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
     }
-    
-    $this->rc->output->send();
+
+    $this->rc->output->send('calendar.dialog');
   }
 
   /**
@@ -3246,7 +3496,12 @@ class calendar extends rcube_plugin
         $tmp_path = tempnam($this->rc->config->get('temp_dir'), 'rcmAttmntCal');
         file_put_contents($tmp_path, $this->get_ical()->export(array($event), '', false, array($this->driver, 'get_attachment_body')));
 
-        $args['attachments'][] = array('path' => $tmp_path, 'name' => $filename . '.ics', 'mimetype' => 'text/calendar');
+        $args['attachments'][] = array(
+          'path'     => $tmp_path,
+          'name'     => $filename . '.ics',
+          'mimetype' => 'text/calendar',
+          'size'     => filesize($tmp_path),
+        );
         $args['param']['subject'] = $event['title'];
       }
     }
@@ -3289,10 +3544,40 @@ class calendar extends rcube_plugin
      $table_itipinvitations = $db->table_name('itipinvitations', true);
      $db->query("DELETE FROM $table_itipinvitations WHERE `user_id` = ?", $args['user']->ID);
 
+     $this->setup();
      $this->load_driver();
      return $this->driver->user_delete($args);
   }
 
+  /**
+   * Find first occurrence of a recurring event excluding start date
+   *
+   * @param array $event Event data (with 'start' and 'recurrence')
+   *
+   * @return DateTime Date of the first occurrence
+   */
+  public function find_first_occurrence($event)
+  {
+    // Make sure libkolab plugin is loaded in case of Kolab driver
+    $this->load_driver();
+
+    // Use libkolab to compute recurring events (and libkolab plugin)
+    // Horde-based fallback has many bugs
+    if (class_exists('kolabformat') && class_exists('kolabcalendaring') && class_exists('kolab_date_recurrence')) {
+      $object = kolab_format::factory('event', 3.0);
+      $object->set($event);
+
+      $recurrence = new kolab_date_recurrence($object);
+    }
+    else {
+      // fallback to libcalendaring (Horde-based) recurrence implementation
+      require_once(__DIR__ . '/lib/calendar_recurrence.php');
+      $recurrence = new calendar_recurrence($this, $event);
+    }
+
+    return $recurrence->first_occurrence();
+  }
+
   /**
    * Magic getter for public access to protected members
    */
diff --git a/plugins/calendar/calendar_base.js b/plugins/calendar/calendar_base.js
index 3f00925b..c089bbd4 100644
--- a/plugins/calendar/calendar_base.js
+++ b/plugins/calendar/calendar_base.js
@@ -33,53 +33,40 @@ function rcube_calendar(settings)
     // extend base class
     rcube_libcalendaring.call(this, settings);
 
-    // member vars
-    this.ui_loaded = false;
-    this.selected_attachment = null;
-
-    // private vars
-    var me = this;
-
     // create new event from current mail message
     this.create_from_mail = function(uid)
     {
-      if (uid || (uid = rcmail.get_single_uid())) {
-        // load calendar UI (scripts and edit dialog template)
-        if (!this.ui_loaded) {
-          $.when(
-            $.getScript(rcmail.assets_path('plugins/calendar/calendar_ui.js')),
-            $.getScript(rcmail.assets_path('plugins/calendar/lib/js/fullcalendar.js')),
-            $.get(rcmail.url('calendar/inlineui'), function(html) { $(document.body).append(html); }, 'html')
-          ).then(function() {
-            // disable attendees feature (autocompletion and stuff is not initialized)
-            for (var c in rcmail.env.calendars)
-              rcmail.env.calendars[c].attendees = rcmail.env.calendars[c].resources = false;
+      if (!uid && !(uid = rcmail.get_single_uid())) {
+        return;
+      }
 
-            me.ui_loaded = true;
-            me.ui = new rcube_calendar_ui(me.settings);
-            me.create_from_mail(uid);  // start over
+      var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1},
+        buttons = {},
+        button_classes = ['mainaction save', 'cancel'],
+        title = rcmail.gettext('calendar.createfrommail'),
+        dialog = $('<iframe>').attr({
+            id: 'kolabcalendarinlinegui',
+            name: 'kolabcalendardialog',
+            src: rcmail.url('calendar/dialog-ui', url)
           });
 
-          return;
-        }
+      // dialog buttons
+      buttons[rcmail.gettext('save')] = function() {
+        var frame = rcmail.get_frame_window('kolabcalendarinlinegui');
+        frame.rcmail.command('event-save');
+      };
 
-        // get message contents for event dialog
-        var lock = rcmail.set_busy(true, 'loading');
-        rcmail.http_post('calendar/mailtoevent', {
-            '_mbox': rcmail.env.mailbox,
-            '_uid': uid
-          }, lock);
-      }
-    };
+      buttons[rcmail.gettext('cancel')] = function() {
+        dialog.dialog('destroy');
+      };
 
-    // callback function triggered from server with contents for the new event
-    this.mail2event_dialog = function(event)
-    {
-      if (event.title) {
-        this.ui.add_event(event);
-        if (rcmail.message_list)
-          rcmail.message_list.blur();
-      }
+      // open jquery UI dialog
+      window.kolab_event_dialog_element = dialog = rcmail.show_popup_dialog(dialog, title, buttons, {
+          button_classes: button_classes,
+          minWidth: 500,
+          width: 600,
+          height: 600
+      });
     };
 
     // handler for attachment-save-calendar commands
@@ -94,7 +81,7 @@ function rcube_calendar(settings)
             // _calendar: $('#calendar-attachment-saveto').val(),
           }, rcmail.set_busy(true, 'itip.savingdata'));
       }
-    }
+    };
 }
 
 
@@ -107,12 +94,9 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     if (rcmail.env.task == 'mail') {
       rcmail.register_command('calendar-create-from-mail', function() { cal.create_from_mail(); });
       rcmail.register_command('attachment-save-calendar', function() { cal.save_to_calendar(); });
-      rcmail.addEventListener('plugin.mail2event_dialog', function(p) { cal.mail2event_dialog(p); });
-      rcmail.addEventListener('plugin.unlock_saving', function(p) { cal.ui && cal.ui.unlock_saving(); });
 
       if (rcmail.env.action != 'show') {
         rcmail.env.message_commands.push('calendar-create-from-mail');
-        rcmail.add_element($('<a>'));
       }
       else {
         rcmail.enable_command('calendar-create-from-mail', true);
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index bb7279d7..99f9c09f 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -32,13 +32,13 @@ function rcube_calendar_ui(settings)
 {
     // extend base class
     rcube_calendar.call(this, settings);
-    
+
     /***  member vars  ***/
     this.is_loading = false;
     this.selected_event = null;
     this.selected_calendar = null;
     this.search_request = null;
-    this.saving_lock;
+    this.saving_lock = null;
     this.calendars = {};
     this.quickview_sources = [];
 
@@ -47,8 +47,6 @@ function rcube_calendar_ui(settings)
     var DAY_MS = 86400000;
     var HOUR_MS = 3600000;
     var me = this;
-    var gmt_offset = (new Date().getTimezoneOffset() / -60) - (settings.timezone || 0) - (settings.dst || 0);
-    var client_timezone = new Date().getTimezoneOffset();
     var day_clicked = day_clicked_ts = 0;
     var ignore_click = false;
     var event_defaults = { free_busy:'busy', alarms:'' };
@@ -68,19 +66,21 @@ function rcube_calendar_ui(settings)
     var freebusy_data = {};
     var current_view = null;
     var count_sources = [];
-    var exec_deferred = bw.ie6 ? 5 : 1;
+    var event_sources = [];
+    var exec_deferred = 1;
     var sensitivitylabels = { 'public':rcmail.gettext('public','calendar'), 'private':rcmail.gettext('private','calendar'), 'confidential':rcmail.gettext('confidential','calendar') };
     var ui_loading = rcmail.set_busy(true, 'loading');
 
     // general datepicker settings
     var datepicker_settings = {
       // translate from fullcalendar format to datepicker format
-      dateFormat: settings['date_format'].replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
-      firstDay : settings['first_day'],
-      dayNamesMin: settings['days_short'],
-      monthNames: settings['months'],
-      monthNamesShort: settings['months'],
+      dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
+      firstDay: settings.first_day,
+    //  dayNamesMin: settings.days_short,
+      monthNames: settings.months,
+      monthNamesShort: settings.months,
       changeMonth: false,
+      showWeek: settings.show_weekno >= 0,
       showOtherMonths: true,
       selectOtherMonths: true
     };
@@ -112,7 +112,7 @@ function rcube_calendar_ui(settings)
       titleFormat: {
         month: 'MMMM yyyy',
         week: settings.dates_long,
-        day: 'dddd ' + settings['date_long'],
+        day: 'dddd ' + settings.date_long,
         table: settings.dates_long
       },
       listPage: 7,  // advance one week in agenda view
@@ -121,6 +121,8 @@ function rcube_calendar_ui(settings)
       tableCols: ['handle', 'date', 'time', 'title', 'location'],
       defaultView: rcmail.env.view || settings.default_view,
       allDayText: rcmail.gettext('all-day', 'calendar'),
+      weekNumbers: settings.show_weekno > 0,
+      weekNumberTitle: rcmail.gettext('weekshort', 'calendar') + ' ',
       buttonText: {
         prev: '&nbsp;&#9668;&nbsp;',
         next: '&nbsp;&#9658;&nbsp;',
@@ -285,127 +287,33 @@ function rcube_calendar_ui(settings)
       else
         return date.getHours() >= settings['work_start'] && date.getHours() < settings['work_end'];
     };
-    
-    // check if the event has 'real' attendees, excluding the current user
-    var has_attendees = function(event)
-    {
-      return (event.attendees && event.attendees.length && (event.attendees.length > 1 || String(event.attendees[0].email).toLowerCase() != settings.identity.email));
-    };
-    
-    // check if the current user is an attendee of this event
-    var is_attendee = function(event, role, email)
-    {
-      var emails = email ? ';'+email.toLowerCase() : settings.identity.emails;
-      for (var i=0; event.attendees && i < event.attendees.length; i++) {
-        if ((!role || event.attendees[i].role == role) && event.attendees[i].email && emails.indexOf(';'+event.attendees[i].email.toLowerCase()) >= 0)
-          return event.attendees[i];
-      }
-      return false;
-    };
-    
-    // check if the current user is the organizer
-    var is_organizer = function(event, email)
-    {
-      return is_attendee(event, 'ORGANIZER', email) || !event.id;
-    };
 
-    /**
-     * Check permissions on the given calendar object
-     */
-    var has_permission = function(cal, perm)
+    var load_attachment = function(data)
     {
-      // multiple chars means "either of"
-      if (String(perm).length > 1) {
-        for (var i=0; i < perm.length; i++) {
-          if (has_permission(cal, perm[i]))
-              return true;
-        }
-      }
+      var event = data.record,
+        query = {_id: data.attachment.id, _event: event.recurrence_id || event.id, _cal: event.calendar};
 
-      if (cal.rights && String(cal.rights).indexOf(perm) >= 0) {
-        return true;
-      }
-
-      return (perm == 'i' && cal.editable) || (perm == 'v' && cal.editable);
-    }
-
-    var load_attachment = function(event, att)
-    {
-      var query = { _id: att.id, _event: event.recurrence_id || event.id, _cal:event.calendar, _frame: 1 };
       if (event.rev)
         query._rev = event.rev;
 
-      // open attachment in frame if it's of a supported mimetype
-      if (id && att.mimetype && $.inArray(att.mimetype, settings.mimetypes)>=0) {
-        if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
-          return;
-        }
-      }
+      if (event.calendar == "--invitation--itip")
+        $.extend(query, {_uid: event._uid, _part: event._part, _mbox: event._mbox});
 
-      query._frame = null;
-      query._download = 1;
-      rcmail.goto_url('get-attachment', query, false);
+      libkolab.load_attachment(query, data.attachment);
     };
 
     // build event attachments list
     var event_show_attachments = function(list, container, event, edit)
     {
-      var i, id, len, img, content, li, elem,
-        ul = document.createElement('UL');
-      ul.className = 'attachmentslist';
-
-      for (i=0, len=list.length; i<len; i++) {
-        elem = list[i];
-        li = document.createElement('LI');
-        li.className = elem.classname;
-
-        if (edit) {
-          rcmail.env.attachments[elem.id] = elem;
-          // delete icon
-          content = $('<a href="#delete" />')
-            .attr('title', rcmail.gettext('delete'))
-            .attr('aria-label', rcmail.gettext('delete') + ' ' + Q(elem.name))
-            .addClass('delete')
-            .click({id: elem.id}, function(e) { remove_attachment(this, e.data.id); return false; });
-
-          if (!rcmail.env.deleteicon)
-            content.html(rcmail.gettext('delete'));
-          else {
-            img = document.createElement('IMG');
-            img.src = rcmail.env.deleteicon;
-            img.alt = rcmail.gettext('delete');
-            content.append(img);
-          }
-
-          content.appendTo(li);
-        }
-
-        // name/link
-        content = $('<a href="#load" />')
-          .html(Q(elem.name))
-          .addClass('file')
-          .click({event: event, att: elem}, function(e) {
-            load_attachment(e.data.event, e.data.att);
-            return false;
-          })
-          .appendTo(li);
-
-        ul.appendChild(li);
-      }
-
-      if (edit && rcmail.gui_objects.attachmentlist) {
-        ul.id = rcmail.gui_objects.attachmentlist.id;
-        rcmail.gui_objects.attachmentlist = ul;
-      }
-
-      container.empty().append(ul);
+      libkolab.list_attachments(list, container, edit, event,
+        function(id) { remove_attachment(id); },
+        function(data) { load_attachment(data); }
+      );
     };
 
-    var remove_attachment = function(elem, id)
+    var remove_attachment = function(id)
     {
-      $(elem.parentNode).hide();
       rcmail.env.deleted_attachments.push(id);
-      delete rcmail.env.attachments[id];
     };
 
     // event details dialog (show only)
@@ -420,7 +328,7 @@ function rcube_calendar_ui(settings)
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
 
-      // remove status-* classes
+      // remove status-* and sensitivity-* classes
       $dialog.removeClass(function(i, oldclass) {
           var oldies = String(oldclass).split(' ');
           return $.grep(oldies, function(cls) { return cls.indexOf('status-') === 0 || cls.indexOf('sensitivity-') === 0 }).join(' ');
@@ -435,57 +343,59 @@ function rcube_calendar_ui(settings)
       // allow other plugins to do actions when event form is opened
       rcmail.triggerEvent('calendar-event-init', {o: event});
 
-      $dialog.find('div.event-section, div.event-line').hide();
+      $dialog.find('div.event-section, div.event-line, .form-group').hide();
       $('#event-title').html(Q(event.title)).show();
       
       if (event.location)
         $('#event-location').html('@ ' + text2html(event.location)).show();
       if (event.description)
-        $('#event-description').show().children('.event-text').html(text2html(event.description, 300, 6));
+        $('#event-description').show().find('.event-text').html(text2html(event.description, 300, 6));
       if (event.vurl)
-        $('#event-url').show().children('.event-text').html(render_link(event.vurl));
+        $('#event-url').show().find('.event-text').html(render_link(event.vurl));
       
       // render from-to in a nice human-readable way
       // -> now shown in dialog title
       // $('#event-date').html(Q(me.event_date_text(event))).show();
       
       if (event.recurrence && event.recurrence_text)
-        $('#event-repeat').show().children('.event-text').html(Q(event.recurrence_text));
+        $('#event-repeat').show().find('.event-text').html(Q(event.recurrence_text));
       
       if (event.valarms && event.alarms_text)
-        $('#event-alarm').show().children('.event-text').html(Q(event.alarms_text));
+        $('#event-alarm').show().find('.event-text').html(Q(event.alarms_text).replace(',', ',<br>'));
       
       if (calendar.name)
-        $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).attr('class', 'event-text cal-'+calendar.id).css('color', calendar.textColor || calendar.color || '');
+        $('#event-calendar').show().find('.event-text').html(Q(calendar.name)).addClass('cal-'+calendar.id).css('color', calendar.textColor || calendar.color || '');
       if (event.categories)
-        $('#event-category').show().children('.event-text').html(Q(event.categories)).attr('class', 'event-text cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
+        $('#event-category').show().find('.event-text').html(Q(event.categories)).addClass('cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
       if (event.free_busy)
-        $('#event-free-busy').show().children('.event-text').html(Q(rcmail.gettext(event.free_busy, 'calendar')));
+        $('#event-free-busy').show().find('.event-text').text(rcmail.gettext(event.free_busy, 'calendar'));
       if (event.priority > 0) {
         var priolabels = [ '', rcmail.gettext('highest'), rcmail.gettext('high'), '', '', rcmail.gettext('normal'), '', '', rcmail.gettext('low'), rcmail.gettext('lowest') ];
-        $('#event-priority').show().children('.event-text').html(Q(event.priority+' '+priolabels[event.priority]));
+        $('#event-priority').show().find('.event-text').html(Q(event.priority+' '+priolabels[event.priority]));
       }
 
       if (event.status) {
         var status_lc = String(event.status).toLowerCase();
-        $('#event-status').show().children('.event-text').html(Q(rcmail.gettext('status-'+status_lc,'calendar')));
+        $('#event-status').show().find('.event-text').text(rcmail.gettext('status-'+status_lc,'calendar'));
+        $('#event-status-badge > span').text(rcmail.gettext('status-'+status_lc,'calendar'));
         $dialog.addClass('status-'+status_lc);
       }
       if (event.sensitivity && event.sensitivity != 'public') {
-        $('#event-sensitivity').show().children('.event-text').html(Q(sensitivitylabels[event.sensitivity]));
+        $('#event-sensitivity').show().find('.event-text').text(sensitivitylabels[event.sensitivity]);
+        $('#event-status-badge > span').text(sensitivitylabels[event.sensitivity]);
         $dialog.addClass('sensitivity-'+event.sensitivity);
       }
       if (event.created || event.changed) {
         var created = parseISO8601(event.created),
-          changed = parseISO8601(event.changed)
-        $('#event-created-changed .event-created').html(Q(created ? format_datetime(created) : rcmail.gettext('unknown','calendar')))
-        $('#event-created-changed .event-changed').html(Q(changed ? format_datetime(changed) : rcmail.gettext('unknown','calendar')))
-        $('#event-created-changed').show()
+          changed = parseISO8601(event.changed);
+        $('.event-created', $dialog).text(created ? format_datetime(created) : rcmail.gettext('unknown','calendar'));
+        $('.event-changed', $dialog).text(changed ? format_datetime(changed) : rcmail.gettext('unknown','calendar'));
+        $('#event-created,#event-changed,#event-created-changed').show()
       }
 
       // create attachments list
       if ($.isArray(event.attachments)) {
-        event_show_attachments(event.attachments, $('#event-attachments').children('.event-text'), event);
+        event_show_attachments(event.attachments, $('#event-attachments').find('.event-text'), event);
         if (event.attachments.length > 0) {
           $('#event-attachments').show();
         }
@@ -497,7 +407,7 @@ function rcube_calendar_ui(settings)
       // build attachments list
       $('#event-links').hide();
       if ($.isArray(event.links) && event.links.length) {
-          render_message_links(event.links || [], $('#event-links').children('.event-text'), false, 'calendar');
+          render_message_links(event.links || [], $('#event-links').find('.event-text'), false, 'calendar');
           $('#event-links').show();
       }
 
@@ -510,35 +420,35 @@ function rcube_calendar_ui(settings)
           return (j - k);
         });
 
-        var data, mystatus = null, rsvp, line, morelink, html = '', overflow = '';
+        var data, mystatus = null, rsvp, line, morelink, html = '', overflow = '',
+          organizer = me.is_organizer(event);
+
         for (var j=0; j < event.attendees.length; j++) {
           data = event.attendees[j];
           if (data.email) {
-            if (data.role == 'ORGANIZER')
-              organizer = true;
-            else if (settings.identity.emails.indexOf(';'+data.email) >= 0) {
-              mystatus = data.status.toLowerCase();
+            if (data.role != 'ORGANIZER' && settings.identity.emails.indexOf(';'+data.email) >= 0) {
+              mystatus = (data.status || 'UNKNOWN').toLowerCase();
               if (data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE' || data.rsvp)
                 rsvp = mystatus;
             }
           }
 
-          line = event_attendee_html(data);
+          line = rcube_libcalendaring.attendee_html(data);
 
           if (morelink)
-            overflow += line;
+            overflow += ' ' + line;
           else
-            html += line;
+            html += ' ' + line;
 
           // stop listing attendees
           if (j == 7 && event.attendees.length >= 7) {
             morelink = $('<a href="#more" class="morelink"></a>').html(rcmail.gettext('andnmore', 'calendar').replace('$nr', event.attendees.length - j - 1));
           }
         }
-        
+
         if (html && (event.attendees.length > 1 || !organizer)) {
           $('#event-attendees').show()
-            .children('.event-text')
+            .find('.event-text')
             .html(html)
             .find('a.mailtolink').click(event_attendee_click);
 
@@ -546,31 +456,31 @@ function rcube_calendar_ui(settings)
           if (morelink) {
             $('#event-attendees .event-text').append(morelink);
             morelink.click(function(e){
-              rcmail.show_popup_dialog(
+              rcmail.simple_dialog(
                 '<div id="all-event-attendees" class="event-attendees">' + html + overflow + '</div>',
                 rcmail.gettext('tabattendees','calendar'),
                 null,
-                { width:450, modal:false });
+                {width: 450, cancel_button: 'close'});
               $('#all-event-attendees a.mailtolink').click(event_attendee_click);
               return false;
-            })
+            });
           }
         }
 
         if (mystatus && !rsvp) {
-          $('#event-partstat').show().children('.changersvp')
-            .removeClass('accepted tentative declined delegated needs-action')
-            .addClass(mystatus)
-            .children('.event-text')
-            .html(Q(rcmail.gettext('itip' + mystatus, 'libcalendaring')));
+          $('#event-partstat').show().find('.changersvp, .event-text')
+            .removeClass('accepted tentative declined delegated needs-action unknown')
+            .addClass(mystatus);
+          $('#event-partstat').find('.event-text')
+            .text(rcmail.gettext('status' + mystatus, 'libcalendaring'));
         }
 
-        var show_rsvp = rsvp && !is_organizer(event) && event.status != 'CANCELLED' && has_permission(calendar, 'v');
+        var show_rsvp = rsvp && !organizer && event.status != 'CANCELLED' && me.has_permission(calendar, 'v');
         $('#event-rsvp')[(show_rsvp ? 'show' : 'hide')]();
-        $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
+        $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel="'+(mystatus || '')+'"]').prop('disabled', true);
 
         if (show_rsvp && event.comment)
-          $('#event-rsvp-comment').show().children('.event-text').html(Q(event.comment));
+          $('#event-rsvp-comment').show().find('.event-text').html(Q(event.comment));
 
         $('#event-rsvp a.reply-comment-toggle').show();
         $('#event-rsvp .itip-reply-comment textarea').hide().val('');
@@ -588,12 +498,13 @@ function rcube_calendar_ui(settings)
       if (!temp && calendar.editable && event.editable !== false) {
         buttons.push({
           text: rcmail.gettext('edit', 'calendar'),
+          'class': 'edit mainaction',
           click: function() {
             event_edit_dialog('edit', event);
           }
         });
       }
-      if (!temp && has_permission(calendar, 'td') && event.editable !== false) {
+      if (!temp && me.has_permission(calendar, 'td') && event.editable !== false) {
         buttons.push({
           text: rcmail.gettext('delete', 'calendar'),
           'class': 'delete',
@@ -604,20 +515,19 @@ function rcube_calendar_ui(settings)
         });
       }
 
-      if (!buttons.length) {
-        buttons.push({
-          text: rcmail.gettext('close', 'calendar'),
-          click: function(){
-            $dialog.dialog('close');
-          }
-        });
-      }
+      buttons.push({
+        text: rcmail.gettext('close', 'calendar'),
+        'class': 'cancel',
+        click: function() {
+          $dialog.dialog('close');
+        }
+      });
 
       // open jquery UI dialog
       $dialog.dialog({
-        modal: false,
-        resizable: !bw.ie6,
-        closeOnEscape: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
+        modal: true,
+        resizable: true,
+        closeOnEscape: true,
         title: me.event_date_text(event),
         open: function() {
           $dialog.attr('aria-hidden', 'false');
@@ -625,17 +535,19 @@ function rcube_calendar_ui(settings)
             $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
           }, 5);
         },
-        close: function() {
+        beforeClose: function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
+        },
+        close: function(e) {
           $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-          rcmail.command('menu-close','eventoptionsmenu');
           $('.libcal-rsvp-replymode').hide();
         },
-        dragStart: function() {
-          rcmail.command('menu-close','eventoptionsmenu');
+        dragStart: function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
           $('.libcal-rsvp-replymode').hide();
         },
-        resizeStart: function() {
-          rcmail.command('menu-close','eventoptionsmenu');
+        resizeStart: function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
           $('.libcal-rsvp-replymode').hide();
         },
         buttons: buttons,
@@ -656,9 +568,8 @@ function rcube_calendar_ui(settings)
       // add link for "more options" drop-down
       if (!temp && !event.temporary && event.calendar != '_resource') {
         $('<a>')
-          .attr('href', '#')
-          .html(rcmail.gettext('eventoptions','calendar'))
-          .addClass('dropdown-link')
+          .attr({href: '#', 'class': 'dropdown-link btn btn-link options', 'data-popup-pos': 'top'})
+          .text(rcmail.gettext('eventoptions','calendar'))
           .click(function(e) {
             return rcmail.command('menu-open','eventoptionsmenu', this, e)
           })
@@ -666,24 +577,8 @@ function rcube_calendar_ui(settings)
       }
 
       rcmail.enable_command('event-history', calendar.history)
-    };
 
-    // render HTML code for displaying an attendee record
-    var event_attendee_html = function(data)
-    {
-      var dispname = Q(data.name || data.email), tooltip = '';
-
-      if (data.email) {
-        tooltip = data.email + '; ' + data.status;
-        dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
-      }
-
-      if (data['delegated-to'])
-        tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
-      else if (data['delegated-from'])
-        tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
-
-      return '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + dispname + '</span> ';
+      rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
     };
 
     // event handler for clicks on an attendee link
@@ -715,8 +610,11 @@ function rcube_calendar_ui(settings)
       event = me.selected_event; // change reference to clone
       freebusy_ui.needsupdate = false;
 
+      if (rcmail.env.action == 'dialog-ui')
+        calendar.attendees = false; // TODO: allow Attendees tab in Save-as-event dialog
+
       // reset dialog first
-      $('#eventtabs').get(0).reset();
+      $('#eventedit form').trigger('reset');
       $('#event-panel-recurrence input, #event-panel-recurrence select, #event-panel-attachments input').prop('disabled', false);
       $('#event-panel-recurrence, #event-panel-attachments').removeClass('disabled');
 
@@ -734,7 +632,7 @@ function rcube_calendar_ui(settings)
       var freebusy = $('#edit-free-busy').val(event.free_busy);
       var priority = $('#edit-priority').val(event.priority);
       var sensitivity = $('#edit-sensitivity').val(event.sensitivity);
-      
+      var syncstart = $('#edit-recurrence-syncstart input');
       var duration = Math.round((event.end.getTime() - event.start.getTime()) / 1000);
       var startdate = $('#edit-startdate').val($.fullCalendar.formatDate(event.start, settings['date_format'])).data('duration', duration);
       var starttime = $('#edit-starttime').val($.fullCalendar.formatDate(event.start, settings['time_format'])).show();
@@ -745,8 +643,12 @@ function rcube_calendar_ui(settings)
       var invite = $('#edit-attendees-invite').get(0);
       var comment = $('#edit-attendees-comment');
 
+      // make sure any calendar is selected
+      if (!calendars.val())
+        calendars.val($('option:first', calendars).attr('value'));
+
       invite.checked = settings.itip_notify & 1 > 0;
-      notify.checked = has_attendees(event) && invite.checked;
+      notify.checked = me.has_attendees(event) && invite.checked;
 
       if (event.allDay) {
         starttime.val("12:00").hide();
@@ -760,7 +662,7 @@ function rcube_calendar_ui(settings)
       // set calendar selection according to permissions
       calendars.find('option').each(function(i, opt) {
         var cal = me.calendars[opt.value] || {};
-        $(opt).prop('disabled', !(cal.editable || (action == 'new' && has_permission(cal, 'i'))))
+        $(opt).prop('disabled', !(cal.editable || (action == 'new' && me.has_permission(cal, 'i'))))
       });
 
       // set alarm(s)
@@ -792,17 +694,17 @@ function rcube_calendar_ui(settings)
         $('#edit-recurring-warning').hide();
 
       // init attendees tab
-      var organizer = !event.attendees || is_organizer(event),
+      var organizer = !event.attendees || me.is_organizer(event),
         allow_invitations = organizer || (calendar.owner && calendar.owner == 'anonymous') || settings.invite_shared;
       event_attendees = [];
       attendees_list = $('#edit-attendees-table > tbody').html('');
       resources_list = $('#edit-resources-table > tbody').html('');
-      $('#edit-attendees-notify')[(allow_invitations && has_attendees(event) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
-      $('#edit-localchanges-warning')[(has_attendees(event) && !(allow_invitations || (calendar.owner && is_organizer(event, calendar.owner))) ? 'show' : 'hide')]();
+      $('#edit-attendees-notify')[(action != 'new' && allow_invitations && me.has_attendees(event) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
+      $('#edit-localchanges-warning')[(action != 'new' && me.has_attendees(event) && !(allow_invitations || (calendar.owner && me.is_organizer(event, calendar.owner))) ? 'show' : 'hide')]();
 
       var load_attendees_tab = function()
       {
-        var j, data, reply_selected = 0;
+        var j, data, organizer_attendee, reply_selected = 0;
         if (event.attendees) {
           for (j=0; j < event.attendees.length; j++) {
             data = event.attendees[j];
@@ -814,6 +716,9 @@ function rcube_calendar_ui(settings)
             add_attendee(data, !allow_invitations);
             if (allow_invitations && data.role != 'ORGANIZER' && !data.noreply)
               reply_selected++;
+
+            if (data.role == 'ORGANIZER')
+              organizer_attendee = data;
           }
         }
 
@@ -829,6 +734,15 @@ function rcube_calendar_ui(settings)
             return false;
           }
         });
+
+        // In case the user is not the (shared) event organizer we'll add the organizer to the selection list
+        if (!identity_id && !organizer && organizer_attendee) {
+          var organizer_name = organizer_attendee.email;
+          if (organizer_attendee.name)
+            organizer_name = '"' + organizer_attendee.name + '" <' + organizer_name + '>';
+          $('#edit-identities-list').append($('<option value="0">').text(organizer_name));
+        }
+
         $('#edit-identities-list').val(identity_id);
         $('#edit-attendees-form')[(allow_invitations?'show':'hide')]();
         $('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')]();
@@ -837,7 +751,7 @@ function rcube_calendar_ui(settings)
       // attachments
       var load_attachments_tab = function()
       {
-        rcmail.enable_command('remove-attachment', calendar.editable && !event.recurrence_id);
+        rcmail.enable_command('remove-attachment', 'upload-file', calendar.editable && !event.recurrence_id);
         rcmail.env.deleted_attachments = [];
         // we're sharing some code for uploads handling with app.js
         rcmail.env.attachments = [];
@@ -853,125 +767,124 @@ function rcube_calendar_ui(settings)
       };
       
       // init dialog buttons
-      var buttons = [];
-      
+      var buttons = [],
+        save_func = function() {
+          var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
+          var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
+
+          // basic input validatetion
+          if (start.getTime() > end.getTime()) {
+            rcmail.alert_dialog(rcmail.gettext('invalideventdates', 'calendar'));
+            return false;
+          }
+
+          // post data to server
+          var data = {
+            calendar: event.calendar,
+            start: date2servertime(start),
+            end: date2servertime(end),
+            allday: allday.checked?1:0,
+            title: title.val(),
+            description: description.val(),
+            location: location.val(),
+            categories: categories.val(),
+            vurl: vurl.val(),
+            free_busy: freebusy.val(),
+            priority: priority.val(),
+            sensitivity: sensitivity.val(),
+            status: eventstatus.val(),
+            recurrence: me.serialize_recurrence(endtime.val()),
+            valarms: me.serialize_alarms('#edit-alarms'),
+            attendees: event_attendees,
+            links: me.selected_event.links,
+            deleted_attachments: rcmail.env.deleted_attachments,
+            attachments: []
+          };
+
+          // uploaded attachments list
+          for (var i in rcmail.env.attachments)
+            if (i.match(/^rcmfile(.+)/))
+              data.attachments.push(RegExp.$1);
+
+          // read attendee roles
+          $('select.edit-attendee-role').each(function(i, elem){
+            if (data.attendees[i])
+              data.attendees[i].role = $(elem).val();
+          });
+
+          if (organizer)
+            data._identity = $('#edit-identities-list option:selected').val();
+
+          // per-attendee notification suppression
+          var need_invitation = false;
+          if (allow_invitations) {
+            $.each(data.attendees, function (i, v) {
+              if (v.role != 'ORGANIZER') {
+                if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
+                  need_invitation = true;
+                  delete data.attendees[i]['noreply'];
+                }
+                else if (settings.itip_notify > 0) {
+                  data.attendees[i].noreply = 1;
+                }
+              }
+            });
+          }
+
+          // tell server to send notifications
+          if ((data.attendees.length || (event.id && event.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
+            data._notify = settings.itip_notify;
+            data._comment = comment.val();
+          }
+
+          data.calendar = calendars.val();
+
+          if (event.id) {
+            data.id = event.id;
+            if (event.recurrence)
+              data._savemode = $('input.edit-recurring-savemode:checked').val();
+            if (data.calendar && data.calendar != event.calendar)
+              data._fromcalendar = event.calendar;
+          }
+
+          if (data.recurrence && syncstart.is(':checked'))
+            data.syncstart = 1;
+
+          update_event(action, data);
+
+          if (rcmail.env.action != 'dialog-ui')
+            $dialog.dialog("close");
+        };
+
+      rcmail.env.event_save_func = save_func;
+
       // save action
       buttons.push({
         text: rcmail.gettext('save', 'calendar'),
-        'class': 'mainaction',
-        click: function() {
-        var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
-        var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
-        
-        // basic input validatetion
-        if (start.getTime() > end.getTime()) {
-          alert(rcmail.gettext('invalideventdates', 'calendar'));
-          return false;
-        }
-        
-        // post data to server
-        var data = {
-          calendar: event.calendar,
-          start: date2servertime(start),
-          end: date2servertime(end),
-          allday: allday.checked?1:0,
-          title: title.val(),
-          description: description.val(),
-          location: location.val(),
-          categories: categories.val(),
-          vurl: vurl.val(),
-          free_busy: freebusy.val(),
-          priority: priority.val(),
-          sensitivity: sensitivity.val(),
-          status: eventstatus.val(),
-          recurrence: me.serialize_recurrence(endtime.val()),
-          valarms: me.serialize_alarms('#edit-alarms'),
-          attendees: event_attendees,
-          links: me.selected_event.links,
-          deleted_attachments: rcmail.env.deleted_attachments,
-          attachments: []
-        };
-
-        // uploaded attachments list
-        for (var i in rcmail.env.attachments)
-          if (i.match(/^rcmfile(.+)/))
-            data.attachments.push(RegExp.$1);
-
-        // read attendee roles
-        $('select.edit-attendee-role').each(function(i, elem){
-          if (data.attendees[i])
-            data.attendees[i].role = $(elem).val();
-        });
-        
-        if (organizer)
-          data._identity = $('#edit-identities-list option:selected').val();
-        
-        // don't submit attendees if only myself is added as organizer
-        if (data.attendees.length == 1 && data.attendees[0].role == 'ORGANIZER' && String(data.attendees[0].email).toLowerCase() == settings.identity.email)
-          data.attendees = [];
-
-        // per-attendee notification suppression
-        var need_invitation = false;
-        if (allow_invitations) {
-          $.each(data.attendees, function (i, v) {
-            if (v.role != 'ORGANIZER') {
-              if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
-                need_invitation = true;
-                delete data.attendees[i]['noreply'];
-              }
-              else if (settings.itip_notify > 0) {
-                data.attendees[i].noreply = 1;
-              }
-            }
-          });
-        }
-
-        // tell server to send notifications
-        if ((data.attendees.length || (event.id && event.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
-          data._notify = settings.itip_notify;
-          data._comment = comment.val();
-        }
-
-        data.calendar = calendars.val();
-
-        if (event.id) {
-          data.id = event.id;
-          if (event.recurrence)
-            data._savemode = $('input.edit-recurring-savemode:checked').val();
-          if (data.calendar && data.calendar != event.calendar)
-            data._fromcalendar = event.calendar;
-        }
-
-        update_event(action, data);
-        $dialog.dialog("close");
-      }  // end click:
+        'class': 'save mainaction',
+        click: save_func
       });
 
-      if (event.id) {
-        buttons.push({
-          text: rcmail.gettext('delete', 'calendar'),
-          'class': 'delete',
-          click: function() {
-            me.delete_event(event);
-            $dialog.dialog('close');
-          }
-        });
-      }
-
       buttons.push({
         text: rcmail.gettext('cancel', 'calendar'),
+        'class': 'cancel',
         click: function() {
           $dialog.dialog("close");
         }
       });
 
-      // show/hide tabs according to calendar's feature support
+      // show/hide tabs according to calendar's feature support and activate first tab (Larry)
       $('#edit-tab-attendees')[(calendar.attendees?'show':'hide')]();
       $('#edit-tab-resources')[(rcmail.env.calendar_resources?'show':'hide')]();
       $('#edit-tab-attachments')[(calendar.attachments?'show':'hide')]();
+      $('#eventedit:not([data-notabs])').tabs('option', 'active', 0); // Larry
 
-      // activate the first tab
-      $('#eventtabs').tabs('option', 'active', 0);
+      // show/hide tabs according to calendar's feature support and activate first tab (Ellastic)
+      $('li > a[href="#event-panel-attendees"]').parent()[(calendar.attendees?'show':'hide')]();
+      $('li > a[href="#event-panel-resources"]').parent()[(rcmail.env.calendar_resources?'show':'hide')]();
+      $('li > a[href="#event-panel-attachments"]').parent()[(calendar.attachments?'show':'hide')]();
+      if ($('#eventedit').data('notabs'))
+        $('#eventedit li.nav-item:first-child a').tab('show');
 
       // hack: set task to 'calendar' to make all dialog actions work correctly
       var comm_path_before = rcmail.env.comm_path;
@@ -979,33 +892,35 @@ function rcube_calendar_ui(settings)
 
       var editform = $("#eventedit");
 
-      // open jquery UI dialog
-      $dialog.dialog({
-        modal: true,
-        resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
-        closeOnEscape: false,
-        title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
-        open: function() {
-          editform.attr('aria-hidden', 'false');
-        },
-        close: function() {
-          editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
-          $dialog.dialog("destroy").remove();
-          rcmail.ksearch_blur();
-          freebusy_data = {};
-          rcmail.env.comm_path = comm_path_before;  // restore comm_path
-          if (op_elem)
-            $(op_elem).focus();
-        },
-        buttons: buttons,
-        minWidth: 500,
-        width: 600
-      }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE6
+      if (rcmail.env.action != 'dialog-ui') {
+        // open jquery UI dialog
+        $dialog.dialog({
+          modal: true,
+          resizable: true,
+          closeOnEscape: false,
+          title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
+          open: function() {
+            editform.attr('aria-hidden', 'false');
+          },
+          close: function() {
+            editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
+            $dialog.dialog("destroy").remove();
+            rcmail.ksearch_blur();
+            freebusy_data = {};
+            rcmail.env.comm_path = comm_path_before;  // restore comm_path
+            if (op_elem)
+              $(op_elem).focus();
+          },
+          buttons: buttons,
+          minWidth: 500,
+          width: 600
+        }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE6
 
-      // set dialog size according to form content
-      me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 550);
+        // set dialog size according to form content
+        me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 550);
 
-      title.select();
+        rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
+      }
 
       // init other tabs asynchronously
       window.setTimeout(function(){ me.set_recurrence_edit(event); }, exec_deferred);
@@ -1013,6 +928,8 @@ function rcube_calendar_ui(settings)
         window.setTimeout(load_attendees_tab, exec_deferred);
       if (calendar.attachments)
         window.setTimeout(load_attachments_tab, exec_deferred);
+
+      title.select();
     };
 
     // show event changelog in a dialog
@@ -1055,7 +972,7 @@ function rcube_calendar_ui(settings)
 
       if (data === false || !data.length || !event) {
         // display 'unavailable' message
-        $('<div class="notfound-message event-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','calendar') + '</div>')
+        $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','calendar') + '</div>')
           .insertBefore($dialog.find('.changelog-table').hide());
         return;
       }
@@ -1116,8 +1033,8 @@ function rcube_calendar_ui(settings)
           }
           // format attendees struct
           else if (prop == 'attendees') {
-            if (change['old']) change.old_ = event_attendee_html(change['old']);
-            if (change['new']) change.new_ = event_attendee_html($.extend({}, change['old'] || {}, change['new']));
+            if (change['old']) change.old_ = rcube_libcalendaring.attendee_html(change['old']);
+            if (change['new']) change.new_ = rcube_libcalendaring.attendee_html($.extend({}, change['old'] || {}, change['new']));
             html = true;
           }
           // localize priority values
@@ -1168,10 +1085,11 @@ function rcube_calendar_ui(settings)
             $('.event-date', $dialog).hide();
       });
 
-      var buttons = {};
-      buttons[rcmail.gettext('close', 'calendar')] = function() {
-        $dialog.dialog('close');
-      };
+      var buttons = [{
+        text: rcmail.gettext('close', 'calendar'),
+        'class': 'cancel',
+        click: function() { $dialog.dialog('close'); }
+      }];
 
       // open jquery UI dialog
       $dialog.dialog({
@@ -1255,7 +1173,7 @@ function rcube_calendar_ui(settings)
       freebusy_data = { required:{}, all:{} };
       freebusy_ui.loading = 1;  // prevent render_freebusy_grid() to load data yet
       freebusy_ui.numdays = Math.max(allday.checked ? 14 : 1, Math.ceil(duration * 2 / 86400));
-      freebusy_ui.interval = allday.checked ? 1440 : 60;
+      freebusy_ui.interval = allday.checked ? 1440 : (60 / (settings.timeslots || 1));
       freebusy_ui.start = fb_start;
       freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
       render_freebusy_grid(0);
@@ -1304,46 +1222,52 @@ function rcube_calendar_ui(settings)
         });
       
       // enable/disable buttons
-      $('#shedule-find-prev').button('option', 'disabled', (fb_start.getTime() < now.getTime()));
+      // FIXME: .button() does nothing in Elastic skin
+      var disabled = fb_start.getTime() < now.getTime();
+      $('#schedule-find-prev').button('option', 'disabled', disabled).prop('disabled', disabled);
       
       // dialog buttons
-      var buttons = {};
-      
-      buttons[rcmail.gettext('select', 'calendar')] = function() {
-        $('#edit-startdate').val(freebusy_ui.startdate.val());
-        $('#edit-starttime').val(freebusy_ui.starttime.val());
-        $('#edit-enddate').val(freebusy_ui.enddate.val());
-        $('#edit-endtime').val(freebusy_ui.endtime.val());
-        
-        // write role changes back to main dialog
-        $('select.edit-attendee-role').each(function(i, elem){
-          if (event_attendees[i] && freebusy_ui.attendees[i]) {
-            event_attendees[i].role = freebusy_ui.attendees[i].role;
-            $(elem).val(event_attendees[i].role);
+      var buttons = [
+        {
+          text: rcmail.gettext('select', 'calendar'),
+          'class': 'save mainaction',
+          click: function() {
+            $('#edit-startdate').val(freebusy_ui.startdate.val());
+            $('#edit-starttime').val(freebusy_ui.starttime.val());
+            $('#edit-enddate').val(freebusy_ui.enddate.val());
+            $('#edit-endtime').val(freebusy_ui.endtime.val());
+
+            // write role changes back to main dialog
+            $('select.edit-attendee-role').each(function(i, elem){
+              if (event_attendees[i] && freebusy_ui.attendees[i]) {
+                event_attendees[i].role = freebusy_ui.attendees[i].role;
+                $(elem).val(event_attendees[i].role);
+              }
+            });
+
+            if (freebusy_ui.needsupdate)
+              update_freebusy_status(me.selected_event);
+            freebusy_ui.needsupdate = false;
+            $dialog.dialog("close");
           }
-        });
-        
-        if (freebusy_ui.needsupdate)
-          update_freebusy_status(me.selected_event);
-        freebusy_ui.needsupdate = false;
-        $dialog.dialog("close");
-      };
-      
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
-      
+        },
+        {
+          text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
+        }
+      ];
+
       $dialog.dialog({
         modal: true,
         resizable: true,
-        closeOnEscape: (!bw.ie6 && !bw.ie7),
+        closeOnEscape: true,
         title: rcmail.gettext('scheduletime', 'calendar'),
         open: function() {
-          $dialog.attr('aria-hidden', 'false').find('#shedule-find-next, #shedule-find-prev').not(':disabled').first().focus();
+          rcmail.ksearch_blur();
+          $dialog.attr('aria-hidden', 'false').find('#schedule-find-next, #schedule-find-prev').not(':disabled').first().focus();
         },
         close: function() {
-          if (bw.ie6)
-            $("#edit-attendees-table").css('visibility','visible');
           $dialog.dialog("destroy").attr('aria-hidden', 'true').hide();
           // TODO: focus opener button
         },
@@ -1355,13 +1279,9 @@ function rcube_calendar_ui(settings)
         width: 850
       }).show();
       
-      // hide edit dialog on IE6 because of drop-down elements
-      if (bw.ie6)
-        $("#edit-attendees-table").css('visibility','hidden');
-      
       // adjust dialog size to fit grid without scrolling
       var gridw = $('#schedule-freebusy-times').width();
-      var overflow = gridw - $('#attendees-freebusy-table td.times').width() + 1;
+      var overflow = gridw - $('#attendees-freebusy-table td.times').width();
       me.dialog_resize($dialog.get(0), $dialog.height() + (bw.ie ? 20 : 0), 800 + Math.max(0, overflow));
       
       // fetch data from server
@@ -1391,10 +1311,12 @@ function rcube_calendar_ui(settings)
       var lastdate, datestr, css,
         curdate = new Date(),
         allday = (freebusy_ui.interval == 1440),
+        interval = allday ? 1440 : (freebusy_ui.interval * (settings.timeslots || 1));
         times_css = (allday ? 'allday ' : ''),
         dates_row = '<tr class="dates">',
         times_row = '<tr class="times">',
         slots_row = '';
+
       for (var s = 0, t = freebusy_ui.start.getTime(); t < freebusy_ui.end.getTime(); s++) {
         curdate.setTime(t);
         datestr = fc.fullCalendar('formatDate', curdate, date_format);
@@ -1407,9 +1329,9 @@ function rcube_calendar_ui(settings)
         // set css class according to working hours
         css = is_weekend(curdate) || (freebusy_ui.interval <= 60 && !is_workinghour(curdate)) ? 'offhours' : 'workinghours';
         times_row += '<td class="' + times_css + css + '" id="t-' + Math.floor(t/1000) + '">' + Q(allday ? rcmail.gettext('all-day','calendar') : $.fullCalendar.formatDate(curdate, settings['time_format'])) + '</td>';
-        slots_row += '<td class="' + css + ' unknown">&nbsp;</td>';
+        slots_row += '<td class="' + css + '">&nbsp;</td>';
         
-        t += freebusy_ui.interval * 60000;
+        t += interval * 60000;
       }
       dates_row += '</tr>';
       times_row += '</tr>';
@@ -1419,12 +1341,12 @@ function rcube_calendar_ui(settings)
       for (var i=0; i < event_attendees.length; i++) {
         data = event_attendees[i];
         domid = String(data.email).replace(rcmail.identifier_expr, '');
-        times_html += '<tr id="fbrow' + domid + '">' + slots_row + '</tr>';
+        times_html += '<tr id="fbrow' + domid + '" class="fbcontent">' + slots_row + '</tr>';
       }
       
       // add line for all/required attendees
-      times_html += '<tr class="spacer"><td colspan="' + (dayslots * freebusy_ui.numdays) + '">&nbsp;</td>';
-      times_html += '<tr id="fbrowall">' + slots_row + '</tr>';
+      times_html += '<tr class="spacer"><td colspan="' + (dayslots * freebusy_ui.numdays) + '"></td>';
+      times_html += '<tr id="fbrowall" class="fbcontent">' + slots_row + '</tr>';
       
       var table = $('#schedule-freebusy-times');
       table.children('thead').html(dates_row + times_row);
@@ -1445,7 +1367,7 @@ function rcube_calendar_ui(settings)
             update_freebusy_dates(newstart, new Date(newstart.getTime() + freebusy_ui.startdate.data('duration') * 1000));
             render_freebusy_overlay();
           }
-        })
+        });
       }
       
       // if we have loaded free-busy data, show it
@@ -1476,39 +1398,53 @@ function rcube_calendar_ui(settings)
           overlay.draggable('disable');
       }
       else {
-        var table = $('#schedule-freebusy-times'),
+        var i, n, table = $('#schedule-freebusy-times'),
           width = 0,
           pos = { top:table.children('thead').height(), left:0 },
           eventstart = date2unixtime(clone_date(me.selected_event.start, me.selected_event.allDay?1:0)),
           eventend = date2unixtime(clone_date(me.selected_event.end, me.selected_event.allDay?2:0)) - 60,
           slotstart = date2unixtime(freebusy_ui.start),
           slotsize = freebusy_ui.interval * 60,
-          slotend, fraction, $cell;
-        
-        // iterate through slots to determine position and size of the overlay
-        table.children('thead').find('td').each(function(i, cell){
-          slotend = slotstart + slotsize - 1;
-          // event starts in this slot: compute left
-          if (eventstart >= slotstart && eventstart <= slotend) {
-            fraction = 1 - (slotend - eventstart) / slotsize;
-            pos.left = Math.round(cell.offsetLeft + cell.offsetWidth * fraction);
-          }
-          // event ends in this slot: compute width
-          if (eventend >= slotstart && eventend <= slotend) {
-            fraction = 1 - (slotend - eventend) / slotsize;
-            width = Math.round(cell.offsetLeft + cell.offsetWidth * fraction) - pos.left;
-          }
+          slotnum = freebusy_ui.interval > 60 ? 1 : (60 / freebusy_ui.interval),
+          cells = table.children('thead').find('td'),
+          cell_width = cells.first().get(0).offsetWidth,
+          h_margin = table.parents('table').data('h-margin'),
+          v_margin = table.parents('table').data('v-margin'),
+          slotend;
 
-          slotstart = slotstart + slotsize;
-        });
+        if (h_margin === undefined)
+          h_margin = 4;
+        if (v_margin === undefined)
+          v_margin = 4;
+
+        // iterate through slots to determine position and size of the overlay
+        for (i=0; i < cells.length; i++) {
+          for (n=0; n < slotnum; n++) {
+            slotend = slotstart + slotsize - 1;
+            // event starts in this slot: compute left
+            if (eventstart >= slotstart && eventstart <= slotend) {
+              pos.left = Math.round(i * cell_width + (cell_width / slotnum) * n);
+            }
+            // event ends in this slot: compute width
+            if (eventend >= slotstart && eventend <= slotend) {
+              width = Math.round(i * cell_width + (cell_width / slotnum) * (n + 1)) - pos.left;
+            }
+            slotstart += slotsize;
+          }
+        }
 
         if (!width)
           width = table.width() - pos.left;
 
         // overlay is visible
         if (width > 0) {
-          overlay.css({ width: (width-5)+'px', height:(table.children('tbody').height() - 4)+'px', left:pos.left+'px', top:pos.top+'px' }).show();
-          
+          overlay.css({
+            width: (width - h_margin) + 'px',
+            height: (table.children('tbody').height() - v_margin) + 'px',
+            left: pos.left + 'px',
+            top: pos.top + 'px'
+          }).show();
+
           // configure draggable
           if (!overlay.data('isdraggable')) {
             overlay.draggable({
@@ -1530,6 +1466,7 @@ function rcube_calendar_ui(settings)
                 }
                 else {
                   // round to 5 minutes
+                  // @TODO: round to timeslots?
                   var round = newstart.getMinutes() % 5;
                   if (round > 2.5) newstart.setTime(newstart.getTime() + (5 - round) * 60000);
                   else if (round > 0) newstart.setTime(newstart.getTime() - round * 60000);
@@ -1547,10 +1484,8 @@ function rcube_calendar_ui(settings)
         else
           overlay.draggable('disable').hide();
       }
-      
     };
-    
-    
+
     // fetch free-busy information for each attendee from server
     var load_freebusy_data = function(from, interval)
     {
@@ -1577,9 +1512,9 @@ function rcube_calendar_ui(settings)
             success: function(data) {
               freebusy_ui.loading--;
               
-              // find attendee 
-              var attendee = null;
-              for (var i=0; i < event_attendees.length; i++) {
+              // find attendee
+              var i, attendee = null;
+              for (i=0; i < event_attendees.length; i++) {
                 if (freebusy_ui.attendees[i].email == data.email) {
                   attendee = freebusy_ui.attendees[i];
                   break;
@@ -1587,25 +1522,31 @@ function rcube_calendar_ui(settings)
               }
               
               // copy data to member var
-              var ts, req = attendee.role != 'OPT-PARTICIPANT';
-              freebusy_data.start = parseISO8601(data.start);
+              var ts, status,
+                req = attendee.role != 'OPT-PARTICIPANT',
+                start = parseISO8601(data.start);
+
+              freebusy_data.start = new Date(start);
+              freebusy_data.end = parseISO8601(data.end);
+              freebusy_data.interval = data.interval;
               freebusy_data[data.email] = {};
-              for (var i=0; i < data.slots.length; i++) {
-                ts = data.times[i] + '';
-                freebusy_data[data.email][ts] = data.slots[i];
+
+              for (i=0; i < data.slots.length; i++) {
+                ts = date2timestring(start, data.interval > 60);
+                status = data.slots.charAt(i);
+                freebusy_data[data.email][ts] = status
+                start = new Date(start.getTime() + data.interval * 60000);
                 
                 // set totals
                 if (!freebusy_data.required[ts])
                   freebusy_data.required[ts] = [0,0,0,0];
                 if (req)
-                  freebusy_data.required[ts][data.slots[i]]++;
+                  freebusy_data.required[ts][status]++;
                 
                 if (!freebusy_data.all[ts])
                   freebusy_data.all[ts] = [0,0,0,0];
-                freebusy_data.all[ts][data.slots[i]]++;
+                freebusy_data.all[ts][status]++;
               }
-              freebusy_data.end = parseISO8601(data.end);
-              freebusy_data.interval = data.interval;
 
               // hide loading indicator
               var domid = String(data.email).replace(rcmail.identifier_expr, '');
@@ -1668,27 +1609,53 @@ function rcube_calendar_ui(settings)
 
       if (fbdata && fbdata[ts] !== undefined && row.length) {
         t = freebusy_ui.start.getTime();
-        row.children().each(function(i, cell){
-          curdate.setTime(t);
-          ts = date2timestring(curdate, dateonly);
-          cell.className = cell.className.replace('unknown', fbdata[ts] ? status_classes[fbdata[ts]] : 'unknown');
+        row.children().each(function(i, cell) {
+          var j, n, attr, last, all_slots = [], slots = [],
+            all_cell = rowall.get(i),
+            cnt = dateonly ? 1 : (60 / freebusy_ui.interval),
+            percent = (100 / cnt);
 
-          // also update total row if all data was loaded
-          if (freebusy_ui.loading == 0 && freebusy_data.all[ts] && (cell = rowall.get(i))) {
-            var workinghours = cell.className.indexOf('workinghours') >= 0;
-            var all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown';
-              req_status = freebusy_data.required[ts][2] ? 'busy' : 'free';
-            for (var j=1; j < status_classes.length; j++) {
-              if (freebusy_ui.numrequired && freebusy_data.required[ts][j] >= freebusy_ui.numrequired)
-                req_status = status_classes[j];
-              if (freebusy_data.all[ts][j] == event_attendees.length)
-                all_status = status_classes[j];
+          for (n=0; n < cnt; n++) {
+            curdate.setTime(t);
+            ts = date2timestring(curdate, dateonly);
+            attr = {
+              'style': 'float:left; width:' + percent.toFixed(2) + '%',
+              'class': fbdata[ts] ? status_classes[fbdata[ts]] : 'unknown'
+            };
+
+            slots.push($('<div>').attr(attr));
+
+            // also update total row if all data was loaded
+            if (!freebusy_ui.loading && freebusy_data.all[ts] && all_cell) {
+              var w, all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown',
+                req_status = freebusy_data.required[ts][2] ? 'busy' : 'free';
+
+              for (j=1; j < status_classes.length; j++) {
+                if (freebusy_ui.numrequired && freebusy_data.required[ts][j] >= freebusy_ui.numrequired)
+                  req_status = status_classes[j];
+                if (freebusy_data.all[ts][j] == event_attendees.length)
+                  all_status = status_classes[j];
+              }
+
+              attr['class'] = req_status + ' all-' + all_status;
+
+              // these elements use some specific styling, so we want to minimize their number
+              if (last && last.attr('class').startsWith(attr['class'])) {
+                w = percent + parseFloat(last.css('width').replace('%', ''));
+                last.css('width', w.toFixed(2) + '%').attr('class', attr['class'] + ' w' + w.toFixed(0));
+              }
+              else {
+                last = $('<div>').attr(attr).addClass('w' + percent.toFixed(0)).append('<span>');
+                all_slots.push(last);
+              }
             }
-            
-            cell.className = (workinghours ? 'workinghours ' : 'offhours ') + req_status +  ' all-' + all_status;
+
+            t += freebusy_ui.interval * 60000;
           }
-          
-          t += freebusy_ui.interval * 60000;
+
+          $(cell).html('').append(slots);
+          if (all_slots.length)
+            $(all_cell).html('').append(all_slots);
         });
       }
     };
@@ -1728,17 +1695,20 @@ function rcube_calendar_ui(settings)
         sinterval = freebusy_data.interval * 60000,
         intvlslots = 1,
         numslots = Math.ceil(duration / sinterval),
-        checkdate, slotend, email, ts, slot, slotdate = new Date();
+        fb_start = freebusy_data.start.getTime(),
+        fb_end = freebusy_data.end.getTime(),
+        checkdate, slotend, email, ts, slot, slotdate = new Date(),
+        candidatecount = 0, candidatestart = false, success = false;
 
       // shift event times to next possible slot
       eventstart += sinterval * intvlslots * dir;
       eventend += sinterval * intvlslots * dir;
 
       // iterate through free-busy slots and find candidates
-      var candidatecount = 0, candidatestart = candidateend = success = false;
-      for (slot = dir > 0 ? freebusy_data.start.getTime() : freebusy_data.end.getTime() - sinterval;
-            (dir > 0 && slot < freebusy_data.end.getTime()) || (dir < 0 && slot >= freebusy_data.start.getTime());
-            slot += sinterval * dir) {
+      for (slot = dir > 0 ? fb_start : fb_end - sinterval;
+            (dir > 0 && slot < fb_end) || (dir < 0 && slot >= fb_start);
+            slot += sinterval * dir
+      ) {
         slotdate.setTime(slot);
         // fix slot if just crossed a DST change
         if (event.allDay) {
@@ -1750,10 +1720,10 @@ function rcube_calendar_ui(settings)
         if ((dir > 0 && slotend <= eventstart) || (dir < 0 && slot >= eventend))  // skip
           continue;
 
-        // respect workingours setting
+        // respect workinghours setting
         if (freebusy_ui.workinhoursonly) {
           if (is_weekend(slotdate) || (freebusy_data.interval <= 60 && !is_workinghour(slotdate))) {  // skip off-hours
-            candidatestart = candidateend = false;
+            candidatestart = false;
             candidatecount = 0;
             continue;
           }
@@ -1762,11 +1732,12 @@ function rcube_calendar_ui(settings)
         if (!candidatestart)
           candidatestart = slot;
 
-        // check freebusy data for all attendees
         ts = date2timestring(slotdate, freebusy_data.interval > 60);
+
+        // check freebusy data for all attendees
         for (var i=0; i < event_attendees.length; i++) {
           if (freebusy_ui.attendees[i].role != 'OPT-PARTICIPANT' && (email = freebusy_ui.attendees[i].email) && freebusy_data[email] && freebusy_data[email][ts] > 1) {
-            candidatestart = candidateend = false;
+            candidatestart = false;
             break;
           }
         }
@@ -1777,27 +1748,20 @@ function rcube_calendar_ui(settings)
           candidatecount = 0;
           continue;
         }
+        else if (dir < 0)
+          candidatestart = slot;
         
-        // set candidate end to slot end time
         candidatecount++;
-        if (dir < 0 && !candidateend)
-          candidateend = slotend;
         
         // if candidate is big enough, this is it!
         if (candidatecount == numslots) {
-          if (dir > 0) {
-            event.start.setTime(candidatestart);
-            event.end.setTime(candidatestart + duration);
-          }
-          else {
-            event.end.setTime(candidateend);
-            event.start.setTime(candidateend - duration);
-          }
+          event.start.setTime(candidatestart);
+          event.end.setTime(candidatestart + duration);
           success = true;
           break;
         }
       }
-      
+
       // update event date/time display
       if (success) {
         update_freebusy_dates(event.start, event.end);
@@ -1810,19 +1774,19 @@ function rcube_calendar_ui(settings)
           render_freebusy_grid(Math.min(-1, offset));
         else
           render_freebusy_overlay();
-        
-        var now = new Date();
-        $('#shedule-find-prev').button('option', 'disabled', (event.start.getTime() < now.getTime()));
-        
+
+        var now = new Date(), disabled = event.start.getTime() < now.getTime();
+        // FIXME: .button() does nothing in Elastic skin
+        $('#schedule-find-prev').button('option', 'disabled', disabled).prop('disabled', disabled);
+
         // speak new selection
         rcmail.display_message(rcmail.gettext('suggestedslot', 'calendar') + ': ' + me.event_date_text(event, true), 'voice');
       }
       else {
-        alert(rcmail.gettext('noslotfound','calendar'));
+        rcmail.alert_dialog(rcmail.gettext('noslotfound','calendar'));
       }
     };
 
-
     // update event properties and attendees availability if event times have changed
     var event_times_changed = function()
     {
@@ -1837,7 +1801,6 @@ function rcube_calendar_ui(settings)
       }
     };
 
-
     // add the given list of participants
     var add_attendees = function(names, params)
     {
@@ -1867,7 +1830,7 @@ function rcube_calendar_ui(settings)
           success = true;
         }
         else {
-          alert(rcmail.gettext('noemailwarning'));
+          rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
         }
       }
       
@@ -1885,13 +1848,12 @@ function rcube_calendar_ui(settings)
       $.each(event_attendees, function(i, v){ exists |= (v.email == data.email); });
       if (exists)
         return false;
-      
+
       var calendar = me.selected_event && me.calendars[me.selected_event.calendar] ? me.calendars[me.selected_event.calendar] : me.calendars[me.selected_calendar];
 
       var dispname = Q(data.name || data.email);
-      if (data.email)
-        dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
-      
+      dispname = '<span' + ((data.email && data.email != dispname) ? ' title="' + Q(data.email) + '"' : '') + '>' + dispname + '</span>';
+
       // role selection
       var organizer = data.role == 'ORGANIZER';
       var opts = {};
@@ -1905,29 +1867,33 @@ function rcube_calendar_ui(settings)
         opts['CHAIR'] =  rcmail.gettext('calendar.rolechair');
 
       if (organizer && !readonly)
-          dispname = rcmail.env['identities-selector'];
-      
-      var select = '<select class="edit-attendee-role"' + (organizer || readonly ? ' disabled="true"' : '') + ' aria-label="' + rcmail.gettext('role','calendar') + '">';
+        dispname = rcmail.env['identities-selector'];
+
+      var select = '<select class="edit-attendee-role form-control custom-select"'
+        + (organizer || readonly ? ' disabled="true"' : '')
+        + ' aria-label="' + rcmail.gettext('role','calendar') + '">';
       for (var r in opts)
         select += '<option value="'+ r +'" class="' + r.toLowerCase() + '"' + (data.role == r ? ' selected="selected"' : '') +'>' + Q(opts[r]) + '</option>';
       select += '</select>';
-      
-      // availability
-      var avail = data.email ? 'loading' : 'unknown';
 
       // delete icon
-      var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
-      var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
-      var tooltip = data.status || '';
+      var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : '<span class="inner">' + Q(rcmail.gettext('delete')) + '</span>';
+      var dellink = '<a href="#delete" class="iconlink icon button delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
+      var tooltip = '', status = (data.status || '').toLowerCase(),
+        status_label = rcmail.gettext('status' + status, 'libcalendaring');
 
       // send invitation checkbox
       var invbox = '<input type="checkbox" class="edit-attendee-reply" value="' + Q(data.email) +'" title="' + Q(rcmail.gettext('calendar.sendinvitations')) + '" '
         + (!data.noreply && settings.itip_notify & 1 ? 'checked="checked" ' : '') + '/>';
 
       if (data['delegated-to'])
-        tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
+        tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
       else if (data['delegated-from'])
-        tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
+        tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
+      else if (!status && organizer)
+        tooltip = rcmail.gettext('statusorganizer', 'libcalendaring');
+      else if (status)
+        tooltip = status_label;
 
       // add expand button for groups
       if (data.cutype == 'GROUP') {
@@ -1935,15 +1901,18 @@ function rcube_calendar_ui(settings)
           rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>';
       }
 
+      var avail = data.email ? 'loading' : 'unknown';
+      var table = rcmail.env.calendar_resources && data.cutype == 'RESOURCE' ? resources_list : attendees_list;
       var img_src = rcmail.assets_path('program/resources/blank.gif');
+      var elastic = $(table).parents('.no-img').length > 0;
+      var avail_tag = elastic ? ('<span class="' + avail + '"') : ('<img alt="" src="' + img_src + '" class="availabilityicon '  + avail + '"');
       var html = '<td class="role">' + select + '</td>' +
         '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
-        '<td class="availability"><img src="' + img_src + '" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' +
-        '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
+        '<td class="availability">' + avail_tag + ' data-email="' + data.email + '" /></td>' +
+        '<td class="confirmstate"><span class="attendee ' + (status || 'organizer') + '" title="' + Q(tooltip) + '">' + Q(status && !elastic ? status_label : '') + '</span></td>' +
         (data.cutype != 'RESOURCE' ? '<td class="invite">' + (organizer || readonly || !invbox ? '' : invbox) + '</td>' : '') +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
 
-      var table = rcmail.env.calendar_resources && data.cutype == 'RESOURCE' ? resources_list : attendees_list;
       var tr = $('<tr>')
         .addClass(String(data.role).toLowerCase())
         .html(html);
@@ -1954,7 +1923,6 @@ function rcube_calendar_ui(settings)
         tr.appendTo(table);
 
       tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; });
-      tr.find('a.mailtolink').click(event_attendee_click);
       tr.find('a.expandlink').click(data, function(e) { me.expand_attendee_group(e, add_attendee, remove_attendee); return false; });
       tr.find('input.edit-attendee-reply').click(function() {
         var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length;
@@ -1964,20 +1932,26 @@ function rcube_calendar_ui(settings)
       // select organizer identity
       if (data.identity_id)
         $('#edit-identities-list').val(data.identity_id);
-      
+
       // check free-busy status
       if (avail == 'loading') {
-        check_freebusy_status(tr.find('img.availabilityicon'), data.email, me.selected_event);
+        check_freebusy_status(tr.find('.availability > *:first'), data.email, me.selected_event);
       }
-      
+
+      // Make Elastic checkboxes pretty
+      if (window.UI && UI.pretty_checkbox) {
+        $(tr).find('input[type=checkbox]').each(function() { UI.pretty_checkbox(this); });
+        $(tr).find('select').each(function() { UI.pretty_select(this); });
+      }
+
       event_attendees.push(data);
       return true;
     };
-    
+
     // iterate over all attendees and update their free-busy status display
     var update_freebusy_status = function(event)
     {
-      attendees_list.find('img.availabilityicon').each(function(i,v) {
+      attendees_list.find('.availability > *').each(function(i,v) {
         var email, icon = $(this);
         if (email = icon.attr('data-email'))
           check_freebusy_status(icon, email, event);
@@ -2004,10 +1978,10 @@ function rcube_calendar_ui(settings)
         data: { email:email, start:date2servertime(clone_date(event.start, event.allDay?1:0)), end:date2servertime(clone_date(event.end, event.allDay?2:0)), _remote: 1 },
         success: function(status){
           var avail = String(status).toLowerCase();
-          icon.removeClass('loading').addClass(avail).attr('alt', rcmail.gettext('avail' + avail, 'calendar'));
+          icon.removeClass('loading').addClass(avail).attr('title', rcmail.gettext('avail' + avail, 'calendar'));
         },
         error: function(){
-          icon.removeClass('loading').addClass('unknown').attr('alt', rcmail.gettext('availunknown', 'calendar'));
+          icon.removeClass('loading').addClass('unknown').attr('title', rcmail.gettext('availunknown', 'calendar'));
         }
       });
     };
@@ -2026,41 +2000,54 @@ function rcube_calendar_ui(settings)
 
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
-  
+
       // dialog buttons
-      var buttons = {};
-  
-      buttons[rcmail.gettext('addresource', 'calendar')] = function() {
-        rcmail.command('add-resource');
-      };
-  
-      buttons[rcmail.gettext('close')] = function() {
-        $dialog.dialog("close");
+      var buttons = [
+        {
+          text: rcmail.gettext('addresource', 'calendar'),
+          'class': 'mainaction save',
+          click: function() { rcmail.command('add-resource'); $dialog.dialog("close"); }
+        },
+        {
+          text: rcmail.gettext('close'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
+        }
+      ];
+
+      var resize = function() {
+        var container = $(rcmail.gui_objects.resourceinfocalendar);
+        container.fullCalendar('option', 'height', container.height() + 1);
       };
 
       // open jquery UI dialog
       $dialog.dialog({
         modal: true,
-        resizable: true,
+        resizable: false, // prevents from Availability tab reflow bugs on resize
         closeOnEscape: true,
         title: rcmail.gettext('findresources', 'calendar'),
+        classes: {'ui-dialog': 'selection-dialog resources-dialog'},
         open: function() {
+          rcmail.ksearch_blur();
           $dialog.attr('aria-hidden', 'false');
+
+          // for Elastic
+          if ($('html.layout-small,html.layout-phone').length) {
+            $('#eventresourcesdialog .resource-selection').css('display', 'flex');
+            $('#eventresourcesdialog .resource-content').css('display', 'none');
+          }
+          setTimeout(resize, 50);
         },
         close: function() {
           $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
         },
-        resize: function(e) {
-          var container = $(rcmail.gui_objects.resourceinfocalendar);
-          container.fullCalendar('option', 'height', container.height() + 4);
-        },
+        resize: resize,
         buttons: buttons,
         width: 900,
         height: 500
       }).show();
 
-      // define add-button as main action
-      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().addClass('mainaction').attr('id', 'rcmbtncalresadd');
+      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().attr('id', 'rcmbtncalresadd');
 
       me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50));
 
@@ -2080,6 +2067,14 @@ function rcube_calendar_ui(settings)
           if (resources_data[node.id]) {
             resource_showinfo(resources_data[node.id]);
             rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible') ? true : false);
+
+            // on elastic mobile display resource info box
+            if ($('html.layout-small,html.layout-phone').length) {
+              $('#eventresourcesdialog .resource-selection').css('display', 'none');
+              $('#eventresourcesdialog .resource-content').css('display', 'flex');
+              $(window).resize();
+              resize();
+            }
           }
           else {
             rcmail.enable_command('add-resource', false);
@@ -2155,9 +2150,9 @@ function rcube_calendar_ui(settings)
         for (var k in attribs) {
           if (typeof attribs[k] == 'undefined')
             continue;
-          table.append($('<tr>').addClass(k)
-            .append('<td class="title">' + Q(ucfirst(rcmail.get_label(k, 'calendar'))) + '</td>')
-            .append('<td class="value">' + text2html(render_attrib(attribs[k])) + '</td>')
+          table.append($('<tr>').addClass(k + ' form-group row')
+            .append('<td class="title col-sm-4"><label class="col-form-label">' + Q(ucfirst(rcmail.get_label(k, 'calendar'))) + '</label></td>')
+            .append('<td class="value col-sm-8 form-control-plaintext">' + text2html(render_attrib(attribs[k])) + '</td>')
           );
         }
 
@@ -2413,7 +2408,7 @@ function rcube_calendar_ui(settings)
         }
         else {
           me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
-          rcmail.http_post('event', { action:'rsvp', e:submit_data, status:response, attendees:attendees, noreply:noreply });
+          rcmail.http_post('calendar/event', { action:'rsvp', e:submit_data, status:response, attendees:attendees, noreply:noreply });
         }
 
         event_show_dialog(me.selected_event);
@@ -2512,55 +2507,60 @@ function rcube_calendar_ui(settings)
     // display confirm dialog when modifying/deleting an event
     var update_event_confirm = function(action, event, data)
     {
+      // Allow other plugins to do actions here
+      // E.g. when you move/resize the event init wasn't called
+      // but we need it as some plugins may modify user identities
+      // we depend on here (kolab_delegation)
+      rcmail.triggerEvent('calendar-event-init', {o: event});
+
       if (!data) data = event;
       var decline = false, notify = false, html = '', cal = me.calendars[event.calendar],
-        _has_attendees = has_attendees(event), _is_organizer = is_organizer(event);
-      
+        _has_attendees = me.has_attendees(event),
+        _is_attendee = _has_attendees && me.is_attendee(event),
+        _is_organizer = me.is_organizer(event);
+
       // event has attendees, ask whether to notify them
       if (_has_attendees) {
         var checked = (settings.itip_notify & 1 ? ' checked="checked"' : '');
-        if (_is_organizer) {
+
+        if (action == 'remove' && cal.group != 'shared' && !_is_organizer && _is_attendee) {
+          decline = true;
+          checked = event.status != 'CANCELLED' ? checked : '';
+          html += '<div class="message dialog-message ui alert boxwarning">' +
+            '<label><input class="confirm-attendees-decline" type="checkbox"' + checked + ' value="1" name="decline" />&nbsp;' +
+            rcmail.gettext('itipdeclineevent', 'calendar') + 
+            '</label></div>';
+        }
+        else if (_is_organizer) {
           notify = true;
           if (settings.itip_notify & 2) {
-            html += '<div class="message">' +
+            html += '<div class="message dialog-message ui alert boxwarning">' +
               '<label><input class="confirm-attendees-donotify" type="checkbox"' + checked + ' value="1" name="notify" />&nbsp;' +
-                rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') + 
+                rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') +
               '</label></div>';
           }
           else {
             data._notify = settings.itip_notify;
           }
         }
-        else if (action == 'remove' && is_attendee(event)) {
-          decline = true;
-          checked = event.status != 'CANCELLED' ? checked : '';
-          html += '<div class="message">' +
-            '<label><input class="confirm-attendees-decline" type="checkbox"' + checked + ' value="1" name="decline" />&nbsp;' +
-            rcmail.gettext('itipdeclineevent', 'calendar') + 
-            '</label></div>';
-        }
-        else {
-          html += '<div class="message">' + rcmail.gettext('localchangeswarning', 'calendar') + '</div>';
-        }
       }
-      
+
       // recurring event: user needs to select the savemode
       if (event.recurrence) {
         var future_disabled = '', message_label = (action == 'remove' ? 'removerecurringeventwarning' : 'changerecurringeventwarning');
 
         // disable the 'future' savemode if I'm an attendee
         // reason: no calendaring system supports the thisandfuture range parameter in iTip REPLY
-        if (action == 'remove' && _has_attendees && !_is_organizer && is_attendee(event)) {
+        if (action == 'remove' && !_is_organizer && _is_attendee) {
           future_disabled = ' disabled';
         }
 
-        html += '<div class="message"><span class="ui-icon ui-icon-alert"></span>' +
-          rcmail.gettext(message_label, 'calendar') + '</div>' +
+        html += '<div class="message dialog-message ui alert boxwarning">' + rcmail.gettext(message_label, 'calendar') + '</div>' +
           '<div class="savemode">' +
-            '<a href="#current" class="button">' + rcmail.gettext('currentevent', 'calendar') + '</a>' +
-            '<a href="#future" class="button' + future_disabled + '">' + rcmail.gettext('futurevents', 'calendar') + '</a>' +
-            '<a href="#all" class="button">' + rcmail.gettext('allevents', 'calendar') + '</a>' +
-            (action != 'remove' ? '<a href="#new" class="button">' + rcmail.gettext('saveasnew', 'calendar') + '</a>' : '') +
+            '<a href="#current" class="button btn btn-secondary">' + rcmail.gettext('currentevent', 'calendar') + '</a>' +
+            '<a href="#future" class="button btn btn-secondary' + future_disabled + '">' + rcmail.gettext('futurevents', 'calendar') + '</a>' +
+            '<a href="#all" class="button btn btn-secondary">' + rcmail.gettext('allevents', 'calendar') + '</a>' +
+            (action != 'remove' ? '<a href="#new" class="button btn btn-secondary">' + rcmail.gettext('saveasnew', 'calendar') + '</a>' : '') +
           '</div>';
       }
       
@@ -2597,6 +2597,7 @@ function rcube_calendar_ui(settings)
         if (!event.recurrence) {
           buttons.push({
             text: rcmail.gettext((action == 'remove' ? 'delete' : 'save'), 'calendar'),
+            'class': action == 'remove' ? 'delete mainaction' : 'save mainaction',
             click: function() {
               data._notify = notify && $dialog.find('input.confirm-attendees-donotify:checked').length ? 1 : 0;
               data._decline = decline && $dialog.find('input.confirm-attendees-decline:checked').length ? 1 : 0;
@@ -2608,6 +2609,7 @@ function rcube_calendar_ui(settings)
 
         buttons.push({
           text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
           click: function() {
             $(this).dialog("close");
           }
@@ -2699,6 +2701,11 @@ function rcube_calendar_ui(settings)
           width: 680,
           height: h,
           title: $.fullCalendar.formatDate(date, 'dddd ' + settings['date_long']),
+          buttons: [{
+            text: rcmail.gettext('cancel', 'calendar'),
+            'class': 'cancel',
+            click: function() { $(this).dialog("close"); }
+          }],
           close: function(){
             dialog.dialog("destroy");
             me.fisheye_date = null;
@@ -2858,88 +2865,60 @@ function rcube_calendar_ui(settings)
       // show confirm dialog for recurring events, use jquery UI dialog
       return update_event_confirm('remove', event, { id:event.id, calendar:event.calendar, attendees:event.attendees });
     };
-    
+
     // opens a jquery UI dialog with event properties (or empty for creating a new calendar)
     this.calendar_edit_dialog = function(calendar)
     {
-      // close show dialog first
-      var $dialog = $("#calendarform");
-      if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-      
       if (!calendar)
         calendar = { name:'', color:'cc0000', editable:true, showalarms:true };
-      
-      var form, name, color, alarms;
-      
-      $dialog.html(rcmail.get_label('loading'));
-      $.ajax({
-        type: 'GET',
-        dataType: 'html',
-        url: rcmail.url('calendar'),
-        data: { action:(calendar.id ? 'form-edit' : 'form-new'), c:{ id:calendar.id } },
-        success: function(data) {
-          $dialog.html(data);
-          // resize and reposition dialog window
-          form = $('#calendarpropform');
-          me.dialog_resize('#calendarform', form.height(), form.width());
-          name = $('#calendar-name').prop('disabled', !calendar.editable).val(calendar.editname || calendar.name);
-          color = $('#calendar-color').val(calendar.color).miniColors({ value: calendar.color, colorValues:rcmail.env.mscolors });
-          alarms = $('#calendar-showalarms').prop('checked', calendar.showalarms).get(0);
-          name.select();
-        }
+
+      var title = rcmail.gettext((calendar.id ? 'editcalendar' : 'createcalendar'), 'calendar'),
+        params = {action: calendar.id ? 'form-edit' : 'form-new', c: {id: calendar.id}, _framed: 1},
+        $dialog = $('<iframe>').attr('src', rcmail.url('calendar', params)).on('load', function() {
+          var contents = $(this).contents();
+          contents.find('#calendar-name')
+            .prop('disabled', !calendar.editable)
+            .val(calendar.editname || calendar.name)
+            .select();
+          contents.find('#calendar-color')
+            .val(calendar.color);
+          contents.find('#calendar-showalarms')
+            .prop('checked', calendar.showalarms);
+        }),
+        save_func = function() {
+          var data,
+            form = $dialog.contents().find('#calendarpropform'),
+            name = form.find('#calendar-name');
+
+          // form is not loaded
+          if (!form || !form.length)
+            return false;
+
+          // do some input validation
+          if (!name.val() || name.val().length < 2) {
+            rcmail.alert_dialog(rcmail.gettext('invalidcalendarproperties', 'calendar'), function() {
+              name.select();
+            });
+
+            return false;
+          }
+
+          // post data to server
+          data = form.serializeJSON();
+          if (data.color)
+            data.color = data.color.replace(/^#/, '');
+          if (calendar.id)
+            data.id = calendar.id;
+
+          me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
+          rcmail.http_post('calendar', { action:(calendar.id ? 'edit' : 'new'), c:data });
+          $dialog.dialog("close");
+        };
+
+      rcmail.simple_dialog($dialog, title, save_func, {
+        width: 600,
+        height: 400
       });
-
-      // dialog buttons
-      var buttons = {};
-      
-      buttons[rcmail.gettext('save', 'calendar')] = function() {
-        // form is not loaded
-        if (!form || !form.length)
-          return;
-          
-        // TODO: do some input validation
-        if (!name.val() || name.val().length < 2) {
-          alert(rcmail.gettext('invalidcalendarproperties', 'calendar'));
-          name.select();
-          return;
-        }
-        
-        // post data to server
-        var data = form.serializeJSON();
-        if (data.color)
-          data.color = data.color.replace(/^#/, '');
-        if (calendar.id)
-          data.id = calendar.id;
-        if (alarms)
-          data.showalarms = alarms.checked ? 1 : 0;
-
-        me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
-        rcmail.http_post('calendar', { action:(calendar.id ? 'edit' : 'new'), c:data });
-        $dialog.dialog("close");
-      };
-
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
-
-      // open jquery UI dialog
-      $dialog.dialog({
-        modal: true,
-        resizable: true,
-        closeOnEscape: false,
-        title: rcmail.gettext((calendar.id ? 'editcalendar' : 'createcalendar'), 'calendar'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
-        close: function() {
-          $dialog.html('').dialog("destroy").hide();
-        },
-        buttons: buttons,
-        minWidth: 400,
-        width: 420
-      }).show();
-
     };
 
     this.calendar_remove = function(calendar)
@@ -2951,13 +2930,24 @@ function rcube_calendar_ui(settings)
 
     this.calendar_delete = function(calendar)
     {
-      if (confirm(rcmail.gettext(calendar.children ? 'deletecalendarconfirmrecursive' : 'deletecalendarconfirm', 'calendar'))) {
+      var label = calendar.children ? 'deletecalendarconfirmrecursive' : 'deletecalendarconfirm';
+      rcmail.confirm_dialog(rcmail.gettext(label, 'calendar'), 'delete', function() {
         rcmail.http_post('calendar', { action:'delete', c:{ id:calendar.id } });
         return true;
-      }
+      });
+
       return false;
     };
 
+    this.calendar_refresh_source = function(id)
+    {
+      // got race-conditions fc.currentFetchID when using refetchEvents,
+      // so we remove and add the source instead
+      // fc.fullCalendar('refetchEvents', me.calendars[id]);
+      fc.fullCalendar('removeEventSource', me.calendars[id]);
+      fc.fullCalendar('addEventSource', me.calendars[id]);
+    };
+
     this.calendar_destroy_source = function(id)
     {
       var delete_ids = [];
@@ -2983,6 +2973,10 @@ function rcube_calendar_ui(settings)
         $('#edit-calendar option[value="'+id+'"]').remove();
         delete this.calendars[id];
       }
+
+      if (this.selected_calendar == id) {
+        this.init_calendars(true);
+      }
     };
 
     // open a dialog to upload an .ics file with events to be imported
@@ -2991,50 +2985,53 @@ function rcube_calendar_ui(settings)
       // close show dialog first
       var $dialog = $("#eventsimport"),
         form = rcmail.gui_objects.importform;
-      
+
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
-      
+
       if (calendar)
         $('#event-import-calendar').val(calendar.id);
-      
-      var buttons = {};
-      buttons[rcmail.gettext('import', 'calendar')] = function() {
-        if (form && form.elements._data.value) {
-          rcmail.async_upload_form(form, 'import_events', function(e) {
-            rcmail.set_busy(false, null, me.saving_lock);
-            $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
 
-            // display error message if no sophisticated response from server arrived (e.g. iframe load error)
-            if (me.import_succeeded === null)
-              rcmail.display_message(rcmail.get_label('importerror', 'calendar'), 'error');
-          });
+      var buttons = [
+        {
+          text: rcmail.gettext('import', 'calendar'),
+          'class' : 'mainaction import',
+          click: function() {
+            if (form && form.elements._data.value) {
+              rcmail.async_upload_form(form, 'import_events', function(e) {
+                rcmail.set_busy(false, null, me.saving_lock);
+                $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
 
-          // display upload indicator (with extended timeout)
-          var timeout = rcmail.env.request_timeout;
-          rcmail.env.request_timeout = 600;
-          me.import_succeeded = null;
-          me.saving_lock = rcmail.set_busy(true, 'uploading');
-          $('.ui-dialog-buttonpane button', $dialog.parent()).button('disable');
+                // display error message if no sophisticated response from server arrived (e.g. iframe load error)
+                if (me.import_succeeded === null)
+                  rcmail.display_message(rcmail.get_label('importerror', 'calendar'), 'error');
+              });
 
-          // restore settings
-          rcmail.env.request_timeout = timeout;
+              // display upload indicator (with extended timeout)
+              var timeout = rcmail.env.request_timeout;
+              rcmail.env.request_timeout = 600;
+              me.import_succeeded = null;
+              me.saving_lock = rcmail.set_busy(true, 'uploading');
+              $('.ui-dialog-buttonpane button', $dialog.parent()).button('disable');
+
+              // restore settings
+              rcmail.env.request_timeout = timeout;
+            }
+          }
+        },
+        {
+          text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
         }
-      };
-      
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
-      
+      ];
+
       // open jquery UI dialog
       $dialog.dialog({
         modal: true,
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('importevents', 'calendar'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -3042,7 +3039,6 @@ function rcube_calendar_ui(settings)
         buttons: buttons,
         width: 520
       }).show();
-      
     };
 
     // callback from server if import succeeded
@@ -3085,26 +3081,33 @@ function rcube_calendar_ui(settings)
         if (custom)
           input.select();
       })
-      
-      var buttons = {};
-      buttons[rcmail.gettext('export', 'calendar')] = function() {
-        if (form) {
-          var start = 0, range = $('#event-export-range option:selected', this).val(),
-            source = $('#event-export-calendar option:selected').val(),
-            attachmt = $('#event-export-attachments').get(0).checked;
 
-          if (range == 'custom')
-            start = date2unixtime(parse_datetime('00:00', $('#event-export-startdate').val()));
-          else if (range > 0)
-            start = 'today -' + range + ' months';
+      var buttons = [
+        {
+          text: rcmail.gettext('export', 'calendar'),
+          'class': 'mainaction export',
+          click: function() {
+            if (form) {
+              var start = 0, range = $('#event-export-range option:selected', this).val(),
+                source = $('#event-export-calendar option:selected').val(),
+                attachmt = $('#event-export-attachments').get(0).checked;
 
-          rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 });
+              if (range == 'custom')
+                start = date2unixtime(parse_datetime('00:00', $('#event-export-startdate').val()));
+              else if (range > 0)
+                start = 'today -' + range + ' months';
+
+              rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 }, false);
+            }
+            $dialog.dialog("close");
+          }
+        },
+        {
+          text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
         }
-      };
-      
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
+      ];
 
       // open jquery UI dialog
       $dialog.dialog({
@@ -3112,9 +3115,6 @@ function rcube_calendar_ui(settings)
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('exporttitle', 'calendar'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -3122,14 +3122,13 @@ function rcube_calendar_ui(settings)
         buttons: buttons,
         width: 520
       }).show();
-      
     };
 
     // download the selected event as iCal
     this.event_download = function(event)
     {
       if (event && event.id) {
-        rcmail.goto_url('export_events', { source:event.calendar, id:event.id, attachments:1 });
+        rcmail.goto_url('export_events', { source:event.calendar, id:event.id, attachments:1 }, false);
       }
     };
 
@@ -3142,37 +3141,60 @@ function rcube_calendar_ui(settings)
       }
     };
 
+    // display the edit dialog, request 'new' action and pass the selected event
+    this.event_copy = function(event) {
+      if (event && event.id) {
+        var copy = $.extend(true, {}, event);
+
+        delete copy.id;
+        delete copy._id;
+        delete copy.created;
+        delete copy.changed;
+        delete copy.recurrence_id;
+        delete copy.attachments; // @TODO
+
+        $.each(copy.attendees, function (k, v) {
+          if (v.role != 'ORGANIZER') {
+            v.status = 'NEEDS-ACTION';
+          }
+        })
+
+        event_edit_dialog('new', copy);
+      }
+    };
+
     // show URL of the given calendar in a dialog box
     this.showurl = function(calendar)
     {
-      var $dialog = $('#calendarurlbox');
-
-      if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-
       if (calendar.feedurl) {
+        var dialog = $('#calendarurlbox').clone(true).removeClass('uidialog');
+
         if (calendar.caldavurl) {
-          $('#caldavurl').val(calendar.caldavurl);
-          $('#calendarcaldavurl').show();
+          $('#caldavurl', dialog).val(calendar.caldavurl);
+          $('#calendarcaldavurl', dialog).show();
         }
         else {
-          $('#calendarcaldavurl').hide();
+          $('#calendarcaldavurl', dialog).hide();
         }
 
-        $dialog.dialog({
-          resizable: true,
-          closeOnEscape: true,
-          title: rcmail.gettext('showurl', 'calendar'),
-          close: function() {
-            $dialog.dialog("destroy").hide();
-          },
-          width: 520
-        }).show();
-
-        $('#calfeedurl').val(calendar.feedurl).select();
+        rcmail.simple_dialog(dialog, rcmail.gettext('showurl', 'calendar'), null, {
+          open: function() { $('#calfeedurl', dialog).val(calendar.feedurl).select(); },
+          cancel_button: 'close'
+        });
       }
     };
 
+    // show free-busy URL in a dialog box
+    this.showfburl = function()
+    {
+      var dialog = $('#fburlbox').clone(true);
+
+      rcmail.simple_dialog(dialog, rcmail.gettext('showfburl', 'calendar'), null, {
+        open: function() { $('#fburl', dialog).val(settings.freebusy_url).select(); },
+        cancel_button: 'close'
+      });
+    };
+
     // refresh the calendar view after saving event data
     this.refresh = function(p)
     {
@@ -3424,12 +3446,13 @@ function rcube_calendar_ui(settings)
           this._search_message = rcmail.display_message(rcmail.gettext('searchnoresults', 'calendar'), 'notice');
           append = '<div class="message">' + rcmail.gettext('searchnoresults', 'calendar') + '</div>';
         }
-        append += '<div class="fc-bottomlinks formlinks"></div>';
+        append += '<div class="fc-bottomlinks formlinks toolbar"></div>';
         addlinks = true;
       }
       
       if (fc.fullCalendar('getView').name == 'table') {
-        var container = fc.find('.fc-list-content > .fc-listappend');
+        var elastic = $('#calendar').data('elastic-mode');
+        var container = elastic ? $('#searchcontrols') : fc.find('.fc-list-content > .fc-listappend');
         if (append) {
           if (!container.length)
             container = $('<div class="fc-listappend"></div>').appendTo(fc.find('.fc-list-content'));
@@ -3437,38 +3460,48 @@ function rcube_calendar_ui(settings)
         }
         else if (container.length)
           container.hide();
-        
+
         // add links to adjust search date range
         if (addlinks) {
           var lc = container.find('.fc-bottomlinks');
-          $('<a>').attr('href', '#').html(rcmail.gettext('searchearlierdates', 'calendar')).appendTo(lc).click(function(){
-            fc.fullCalendar('incrementDate', 0, -1, 0);
-          });
+
+          if (elastic) {
+            $('<a>').attr({href: '#', 'class': 'button icon tools'})
+              .append($('<span class="inner">').text(rcmail.gettext('showtools')))
+              .prependTo('#searchcontrols')
+              .click(function() {
+                $(this).attr('title', rcmail.gettext($('#searchcontrols').toggleClass('open').is('.open') ? 'hidetools' : 'showtools'));
+              });
+          }
+
+          $('<a>').attr({href: '#', 'class': 'button prev'})
+            .append($('<span class="inner">').text(rcmail.gettext(elastic ? 'earlierevents' : 'searchearlierdates', 'calendar')))
+            .appendTo(lc)
+            .click(function() {
+              fc.fullCalendar('incrementDate', 0, -1, 0);
+            });
+
           lc.append(" ");
-          $('<a>').attr('href', '#').html(rcmail.gettext('searchlaterdates', 'calendar')).appendTo(lc).click(function(){
-            var range = fc.fullCalendar('option', 'listRange');
-            if (range < 90) {
-              fc.fullCalendar('option', 'listRange', fc.fullCalendar('option', 'listRange') + 30).fullCalendar('render');
-              update_agenda_toolbar();
-            }
-            else
-              fc.fullCalendar('incrementDate', 0, 1, 0);
-          });
+
+          $('<a>').attr({href: '#', 'class': 'button next'})
+            .append($('<span class="inner">').text(rcmail.gettext(elastic ? 'laterevents' : 'searchlaterdates', 'calendar')))
+            .appendTo(lc)
+            .click(function() {
+              var range = fc.fullCalendar('option', 'listRange');
+              if (range < 90) {
+                fc.fullCalendar('option', 'listRange', fc.fullCalendar('option', 'listRange') + 30).fullCalendar('render');
+                update_agenda_toolbar();
+              }
+              else
+                fc.fullCalendar('incrementDate', 0, 1, 0);
+            });
         }
       }
-      
+
       if (this.fisheye_date)
         this.fisheye_view(this.fisheye_date);
     };
 
-    // resize and reposition (center) the dialog window
-    this.dialog_resize = function(id, height, width)
-    {
-      var win = $(window), w = win.width(), h = win.height();
-      $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) })
-        .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
-    };
-
     // adjust calendar view size
     this.view_resize = function()
     {
@@ -3486,6 +3519,10 @@ function rcube_calendar_ui(settings)
       rcmail.triggerEvent('selectfolder', { folder:id, prefix:'rcmlical' });
 
       this.selected_calendar = id;
+
+      rcmail.update_state({source: id});
+
+      rcmail.enable_command('addevent', this.calendars[id] && this.calendars[id].editable);
     };
 
     // register the given calendar to the current view
@@ -3524,7 +3561,7 @@ function rcube_calendar_ui(settings)
 
       // insert to #calendar-select options if writeable
       select = $('#edit-calendar');
-      if (fc && has_permission(cal, 'i') && select.length && !select.find('option[value="'+id+'"]').length) {
+      if (fc && me.has_permission(cal, 'i') && select.length && !select.find('option[value="'+id+'"]').length) {
         $('<option>').attr('value', id).html(cal.name).appendTo(select);
       }
     }
@@ -3539,32 +3576,41 @@ function rcube_calendar_ui(settings)
       }
     };
 
+    this.init_calendars = function(refresh)
+    {
+      var id, cal, active;
+
+      for (id in rcmail.env.calendars) {
+        cal = rcmail.env.calendars[id];
+        active = cal.active || false;
+
+        if (!refresh) {
+          add_calendar_source(cal);
+
+          // check active calendars
+          $('#rcmlical'+id+' > .calendar input').prop('checked', active);
+
+          if (active) {
+            event_sources.push(this.calendars[id]);
+          }
+          if (cal.counts) {
+            count_sources.push(id);
+          }
+        }
+
+        if (cal.editable && (!this.selected_calendar || refresh)) {
+          this.selected_calendar = id;
+          if (refresh) {
+            this.select_calendar(id);
+            refresh = false;
+          }
+        }
+      }
+    };
+
 
     /***  startup code  ***/
 
-    // create list of event sources AKA calendars
-    var id, cal, active, event_sources = [];
-    for (id in rcmail.env.calendars) {
-      cal = rcmail.env.calendars[id];
-      active = cal.active || false;
-      add_calendar_source(cal);
-
-      // check active calendars
-      $('#rcmlical'+id+' > .calendar input').prop('checked', active);
-
-      if (active) {
-        event_sources.push(this.calendars[id]);
-      }
-      if (cal.counts) {
-        count_sources.push(id);
-      }
-
-      if (cal.editable && !this.selected_calendar) {
-        this.selected_calendar = id;
-        rcmail.enable_command('addevent', true);
-      }
-    }
-
     // initialize treelist widget that controls the calendars list
     var widget_class = window.kolab_folderlist || rcube_treelist_widget;
     calendars_list = new widget_class(rcmail.gui_objects.calendarslist, {
@@ -3580,7 +3626,7 @@ function rcube_calendar_ui(settings)
     calendars_list.addEventListener('select', function(node) {
       if (node && node.id && me.calendars[node.id]) {
         me.select_calendar(node.id, true);
-        rcmail.enable_command('calendar-edit', 'calendar-showurl', true);
+        rcmail.enable_command('calendar-edit', 'calendar-showurl', 'calendar-showfburl', true);
         rcmail.enable_command('calendar-delete', me.calendars[node.id].editable);
         rcmail.enable_command('calendar-remove', me.calendars[node.id] && me.calendars[node.id].removable);
       }
@@ -3614,7 +3660,7 @@ function rcube_calendar_ui(settings)
       if (data.length)
         rcmail.display_message(rcmail.gettext('nrcalendarsfound','calendar').replace('$nr', data.length), 'voice');
       else
-        rcmail.display_message(rcmail.gettext('nocalendarsfound','calendar'), 'info');
+        rcmail.display_message(rcmail.gettext('nocalendarsfound','calendar'), 'notice');
     });
     calendars_list.addEventListener('click-item', function(event) {
       // handle clicks on quickview icon: temprarily add this source and open in quickview
@@ -3691,13 +3737,28 @@ function rcube_calendar_ui(settings)
       me.calendar_edit_dialog(me.calendars[id]);
     });
 
+    // Make Elastic checkboxes pretty
+    if (window.UI && UI.pretty_checkbox) {
+      $(rcmail.gui_objects.calendarslist).find('input[type=checkbox]').each(function() {
+        UI.pretty_checkbox($(this).addClass('flex-checkbox'));
+       });
+       calendars_list.addEventListener('add-item', function(prop) {
+         UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+       });
+    }
+
+    // create list of event sources AKA calendars
+    this.init_calendars();
+
     // select default calendar
-    if (settings.default_calendar && this.calendars[settings.default_calendar] && this.calendars[settings.default_calendar].editable)
+    if (rcmail.env.source && this.calendars[rcmail.env.source])
+      this.selected_calendar = rcmail.env.source;
+    else if (settings.default_calendar && this.calendars[settings.default_calendar] && this.calendars[settings.default_calendar].editable)
       this.selected_calendar = settings.default_calendar;
-    
+
     if (this.selected_calendar)
       this.select_calendar(this.selected_calendar);
-    
+
     var viewdate = new Date();
     if (rcmail.env.date)
       viewdate.setTime(fromunixtime(rcmail.env.date));
@@ -3812,7 +3873,8 @@ function rcube_calendar_ui(settings)
           id: event.id,
           calendar: event.calendar,
           start: date2servertime(event.start),
-          end: date2servertime(event.end)
+          end: date2servertime(event.end),
+          allday: event.allDay?1:0
         };
         update_event_confirm('resize', event, data);
       },
@@ -3832,77 +3894,6 @@ function rcube_calendar_ui(settings)
       }
     }));
 
-    // format time string
-    var formattime = function(hour, minutes, start) {
-      var time, diff, unit, duration = '', d = new Date();
-      d.setHours(hour);
-      d.setMinutes(minutes);
-      time = $.fullCalendar.formatDate(d, settings['time_format']);
-      if (start) {
-        diff = Math.floor((d.getTime() - start.getTime()) / 60000);
-        if (diff > 0) {
-          unit = 'm';
-          if (diff >= 60) {
-            unit = 'h';
-            diff = Math.round(diff / 3) / 20;
-          }
-          duration = ' (' + diff + unit + ')';
-        }
-      }
-      return [time, duration];
-    };
-
-    var autocomplete_times = function(p, callback) {
-      /* Time completions */
-      var result = [];
-      var now = new Date();
-      var st, start = (String(this.element.attr('id')).indexOf('endtime') > 0
-        && (st = $('#edit-starttime').val())
-        && $('#edit-startdate').val() == $('#edit-enddate').val())
-        ? parse_datetime(st, '') : null;
-      var full = p.term - 1 > 0 || p.term.length > 1;
-      var hours = start ? start.getHours() :
-        (full ? parse_datetime(p.term, '') : now).getHours();
-      var step = 15;
-      var minutes = hours * 60 + (full ? 0 : now.getMinutes());
-      var min = Math.ceil(minutes / step) * step % 60;
-      var hour = Math.floor(Math.ceil(minutes / step) * step / 60);
-      // list hours from 0:00 till now
-      for (var h = start ? start.getHours() : 0; h < hours; h++)
-        result.push(formattime(h, 0, start));
-      // list 15min steps for the next two hours
-      for (; h < hour + 2 && h < 24; h++) {
-        while (min < 60) {
-          result.push(formattime(h, min, start));
-          min += step;
-        }
-        min = 0;
-      }
-      // list the remaining hours till 23:00
-      while (h < 24)
-        result.push(formattime((h++), 0, start));
-      
-      return callback(result);
-    };
-
-    var autocomplete_open = function(event, ui) {
-      // scroll to current time
-      var $this = $(this);
-      var widget = $this.autocomplete('widget');
-      var menu = $this.data('ui-autocomplete').menu;
-      var amregex = /^(.+)(a[.m]*)/i;
-      var pmregex = /^(.+)(a[.m]*)/i;
-      var val = $(this).val().replace(amregex, '0:$1').replace(pmregex, '1:$1');
-      var li, html;
-      widget.css('width', '10em');
-      widget.children().each(function(){
-        li = $(this);
-        html = li.children().first().html().replace(/\s+\(.+\)$/, '').replace(amregex, '0:$1').replace(pmregex, '1:$1');
-        if (html.indexOf(val) == 0)
-          menu._scrollIntoView(li);
-      });
-    };
-
     // if start date is changed, shift end date according to initial duration
     var shift_enddate = function(dateText) {
       var newstart = parse_datetime('0', dateText);
@@ -3922,21 +3913,30 @@ function rcube_calendar_ui(settings)
     var minical;
     var init_calendar_ui = function()
     {
+      var pretty_select = function(elem) {
+        // for Elastic
+        if (window.UI && UI.pretty_select) {
+          $(elem).addClass('form-control custom-select').each(function() { UI.pretty_select(this); });
+        }
+      };
+
       // initialize small calendar widget using jQuery UI datepicker
       minical = $('#datepicker').datepicker($.extend(datepicker_settings, {
         inline: true,
-        showWeek: true,
         changeMonth: true,
         changeYear: true,
         onSelect: function(dateText, inst) {
           ignore_click = true;
           var d = minical.datepicker('getDate'); //parse_datetime('0:0', dateText);
           fc.fullCalendar('gotoDate', d).fullCalendar('select', d, d, true);
+          setTimeout(function() { pretty_select($('select', minical)); }, 25);
         },
         onChangeMonthYear: function(year, month, inst) {
           minical.data('year', year).data('month', month);
+          setTimeout(function() { pretty_select($('select', minical)); }, 25);
         },
         beforeShowDay: function(date) {
+          setTimeout(function() { pretty_select($('select', minical)); }, 25);
           var view = fc.fullCalendar('getView');
           var active = view.visStart && date.getTime() >= view.visStart.getTime() && date.getTime() < view.visEnd.getTime();
           return [ true, (active ? 'ui-datepicker-activerange ui-datepicker-active-' + view.name : ''), ''];
@@ -3964,6 +3964,7 @@ function rcube_calendar_ui(settings)
               date = new Date(base_date.getTime() - day_off * DAY_MS + wdiff * 7 * DAY_MS);
             fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek');
             minical.datepicker('setDate', date);
+            setTimeout(function() { pretty_select($('select', minical)); }, 25);
           }
         });
 
@@ -3976,57 +3977,55 @@ function rcube_calendar_ui(settings)
       }
 
       // init event dialog
-      $('#eventtabs').tabs({
-        activate: function(event, ui) {
-          if (ui.newPanel.selector == '#event-panel-attendees' || ui.newPanel.selector == '#event-panel-resources') {
-            var tab = ui.newPanel.selector == '#event-panel-resources' ? 'resource' : 'attendee';
+      var tab_change = function(event, ui) {
+          // newPanel.selector for jQuery-UI 1.10, newPanel.attr('id') for jQuery-UI 1.12, href for Bootstrap tabs
+          var tab = (ui ? String(ui.newPanel.selector || ui.newPanel.attr('id')) : $(event.target).attr('href'))
+            .replace(/^#?event-panel-/, '').replace(/s$/, '');
+          var has_real_attendee = function(attendees) {
+              for (var i=0; i < (attendees ? attendees.length : 0); i++) {
+                if (attendees[i].cutype != 'RESOURCE')
+                  return true;
+              }
+            };
+
+          if (tab == 'attendee' || tab == 'resource') {
             if (!rcube_event.is_keyboard(event))
               $('#edit-'+tab+'-name').select();
             // update free-busy status if needed
             if (freebusy_ui.needsupdate && me.selected_event)
               update_freebusy_status(me.selected_event);
             // add current user as organizer if non added yet
-            if (!event_attendees.length) {
+            if (tab == 'attendee' && !has_real_attendee(event_attendees)) {
               add_attendee($.extend({ role:'ORGANIZER' }, settings.identity));
               $('#edit-attendees-form .attendees-invitebox').show();
             }
           }
+
           // reset autocompletion on tab change (#3389)
-          if (ui.oldPanel.selector == '#event-panel-attendees' || ui.oldPanel.selector == '#event-panel-resources') {
-            rcmail.ksearch_blur();
-          }
-        }
-      });
+          rcmail.ksearch_blur();
+
+          // display recurrence warning in recurrence tab only
+          if (tab == 'recurrence')
+            $('#edit-recurrence-frequency').change();
+          else
+            $('#edit-recurrence-syncstart').hide();
+      };
+
+      $('#eventedit:not([data-notabs])').tabs({activate: tab_change});             // Larry
+      $('#eventedit a.nav-link').on('show.bs.tab', tab_change); // Elastic
+
       $('#edit-enddate').datepicker(datepicker_settings);
       $('#edit-startdate').datepicker(datepicker_settings).datepicker('option', 'onSelect', shift_enddate).change(function(){ shift_enddate(this.value); });
       $('#edit-enddate').datepicker('option', 'onSelect', event_times_changed).change(event_times_changed);
       $('#edit-allday').click(function(){ $('#edit-starttime, #edit-endtime')[(this.checked?'hide':'show')](); event_times_changed(); });
 
       // configure drop-down menu on time input fields based on jquery UI autocomplete
-      $('#edit-starttime, #edit-endtime, #eventedit input.edit-alarm-time')
-        .attr('autocomplete', "off")
-        .autocomplete({
-          delay: 100,
-          minLength: 1,
-          appendTo: '#eventedit',
-          source: autocomplete_times,
-          open: autocomplete_open,
-          change: event_times_changed,
-          select: function(event, ui) {
-            $(this).val(ui.item[0]).change();
-            return false;
-          }
-        })
-        .click(function() {  // show drop-down upon clicks
-          $(this).autocomplete('search', $(this).val() ? $(this).val().replace(/\D.*/, "") : " ");
-        }).each(function(){
-          $(this).data('ui-autocomplete')._renderItem = function(ul, item) {
-            return $('<li>')
-              .data('ui-autocomplete-item', item)
-              .append('<a>' + item[0] + item[1] + '</a>')
-              .appendTo(ul);
-            };
+      $('#edit-starttime, #edit-endtime').each(function() {
+        me.init_time_autocomplete(this, {
+          container: '#eventedit',
+          change: event_times_changed
         });
+      });
 
       // adjust end time when changing start
       $('#edit-starttime').change(function(e) {
@@ -4045,7 +4044,7 @@ function rcube_calendar_ui(settings)
       // reload free-busy status when changing the organizer identity
       $('#eventedit').on('change', '#edit-identities-list', function(e) {
         var email = settings.identities[$(this).val()],
-          icon = $(this).closest('tr').find('img.availabilityicon');
+          icon = $(this).closest('tr').find('.availability > *');
 
         if (email && icon.length) {
           icon.attr('data-email', email);
@@ -4066,9 +4065,10 @@ function rcube_calendar_ui(settings)
       }
       rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
       rcmail.addEventListener('autocomplete_insert', function(e) {
-        var success = false;
+        var cutype, success = false;
         if (e.field.name == 'participant') {
-          success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:(e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL') });
+          cutype = e.data && e.data.type == 'group' && e.result_type == 'person' ? 'GROUP' : 'INDIVIDUAL';
+          success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:cutype });
         }
         else if (e.field.name == 'resource' && e.data && e.data.email) {
           success = add_attendee($.extend(e.data, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }));
@@ -4095,12 +4095,17 @@ function rcube_calendar_ui(settings)
           input.val('');
         }
       });
-      
+
       $('#edit-resource-find').click(function(){
         event_resources_dialog();
         return false;
       });
 
+      $('#resource-content a.nav-link').on('click', function() {
+        e.preventDefault();
+        $(this).tab('show');
+      });
+
       // handle change of "send invitations" checkbox
       $('#edit-attendees-invite').change(function() {
         $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
@@ -4118,11 +4123,11 @@ function rcube_calendar_ui(settings)
         event_freebusy_dialog();
       });
 
-      $('#shedule-freebusy-prev').html(bw.ie6 ? '&lt;&lt;' : '&#9668;').button().click(function(){ render_freebusy_grid(-1); });
-      $('#shedule-freebusy-next').html(bw.ie6 ? '&gt;&gt;' : '&#9658;').button().click(function(){ render_freebusy_grid(1); }).parent().buttonset();
+      $('#schedule-freebusy-prev').html('&#9668;').button().click(function(){ render_freebusy_grid(-1); });
+      $('#schedule-freebusy-next').html('&#9658;').button().click(function(){ render_freebusy_grid(1); }); // FIXME .parent().buttonset();
 
-      $('#shedule-find-prev').button().click(function(){ freebusy_find_slot(-1); });
-      $('#shedule-find-next').button().click(function(){ freebusy_find_slot(1); });
+      $('#schedule-find-prev').button().click(function(){ freebusy_find_slot(-1); });
+      $('#schedule-find-next').button().click(function(){ freebusy_find_slot(1); });
 
       $('#schedule-freebusy-workinghours').click(function(){
         freebusy_ui.workinhoursonly = this.checked;
@@ -4144,10 +4149,14 @@ function rcube_calendar_ui(settings)
 
       $('#eventshow .changersvp').click(function(e) {
         var d = $('#eventshow'),
-          h = -$(this).closest('.event-line').toggle().height();
+          record = $(this).closest('.event-line,.form-group'),
+          h = d.height() - record.height();
+
+        record.toggle();
         $('#event-rsvp').slideDown(300, function() {
-          h += $(this).height();
-          me.dialog_resize(d.get(0), d.height() + h, d.outerWidth() - 50);
+          me.dialog_resize(d.get(0), h + $(this).outerHeight());
+          if (this.scrollIntoView)
+            this.scrollIntoView(false);
         });
         return false;
       })
@@ -4194,23 +4203,51 @@ function rcube_calendar_ui(settings)
     if (!bw.ie)
       $('div.fc-content').addClass('rcube-fc-content');
 
-    // IE supresses 2nd click event when double-clicking
-    if (bw.ie && bw.vendver < 9) {
-      $('div.fc-content').bind('dblclick', function(e){
-        if (!$(this).hasClass('fc-widget-header') && fc.fullCalendar('getView').name != 'table') {
-          var date = fc.fullCalendar('getDate');
-          var enddate = new Date(); enddate.setTime(date.getTime() + DAY_MS - 60000);
-          event_edit_dialog('new', { start:date, end:enddate, allDay:true, calendar:me.selected_calendar });
-        }
+    // Save-as-event dialog content
+    if (rcmail.env.action == 'dialog-ui') {
+      var date = new Date(), event = {allDay: false, calendar: me.selected_calendar};
+
+      date.setHours(date.getHours()+1);
+      date.setMinutes(0);
+
+      var end = new Date(date.getTime());
+      end.setHours(date.getHours()+1);
+
+      event.start = date;
+      event.end = end;
+
+      // exec deferred because it must be after init_calendar_ui
+      window.setTimeout(function() {
+        event_edit_dialog('new', $.extend(event, rcmail.env.event_prop));
+      }, exec_deferred);
+
+      rcmail.register_command('event-save', function() { rcmail.env.event_save_func(); }, true);
+      rcmail.addEventListener('plugin.unlock_saving', function(status) {
+        me.unlock_saving();
+        if (status)
+          window.parent.kolab_event_dialog_element.dialog('destroy');
       });
     }
 } // end rcube_calendar class
 
 
+// Update layout after initialization
+// In devel mode we have to wait until all styles are applied by less
+if (rcmail.env.devel_mode && window.less) {
+  less.pageLoadFinished.then(function() { $(window).resize(); });
+}
+
 /* calendar plugin initialization */
 window.rcmail && rcmail.addEventListener('init', function(evt) {
+  // let's go
+  var cal = new rcube_calendar_ui($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
+
+  if (rcmail.env.action == 'dialog-ui') {
+    return;
+  }
+
   // configure toolbar buttons
-  rcmail.register_command('addevent', function(){ cal.add_event(); }, true);
+  rcmail.register_command('addevent', function(){ cal.add_event(); });
   rcmail.register_command('print', function(){ cal.print_calendars(); }, true);
 
   // configure list operations
@@ -4220,8 +4257,10 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   rcmail.register_command('calendar-delete', function(){ cal.calendar_delete(cal.calendars[cal.selected_calendar]); }, false);
   rcmail.register_command('events-import', function(){ cal.import_events(cal.calendars[cal.selected_calendar]); }, true);
   rcmail.register_command('calendar-showurl', function(){ cal.showurl(cal.calendars[cal.selected_calendar]); }, false);
+  rcmail.register_command('calendar-showfburl', function(){ cal.showfburl(); }, false);
   rcmail.register_command('event-download', function(){ cal.event_download(cal.selected_event); }, true);
   rcmail.register_command('event-sendbymail', function(p, obj, e){ cal.event_sendbymail(cal.selected_event, e); }, true);
+  rcmail.register_command('event-copy', function(){ cal.event_copy(cal.selected_event); }, true);
   rcmail.register_command('event-history', function(p, obj, e){ cal.event_history_dialog(cal.selected_event); }, false);
 
   // search and export events
@@ -4235,6 +4274,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   rcmail.register_command('add-resource', function(){ cal.add_resource2event(); }, false);
 
   // register callback commands
+  rcmail.addEventListener('plugin.refresh_source', function(data) { cal.calendar_refresh_source(data); });
   rcmail.addEventListener('plugin.destroy_source', function(p){ cal.calendar_destroy_source(p.id); });
   rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.unlock_saving(); });
   rcmail.addEventListener('plugin.refresh_calendar', function(p){ cal.refresh(p); });
@@ -4251,15 +4291,28 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   rcmail.addEventListener('plugin.itip_message_processed', function(data){ cal.itip_message_processed(data); });
   rcmail.addEventListener('requestrefresh', function(q){ return cal.before_refresh(q); });
 
-  // let's go
-  var cal = new rcube_calendar_ui($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
-
   $(window).resize(function(e) {
     // check target due to bugs in jquery
     // http://bugs.jqueryui.com/ticket/7514
     // http://bugs.jquery.com/ticket/9841
     if (e.target == window) {
       cal.view_resize();
+
+      // In Elastic append the datepicker back to sidebar/dialog when resizing
+      // the window from tablet/phone to desktop and vice-versa
+      var dp = $('#datepicker'), in_dialog = dp.is('.ui-dialog-content'), width = $(window).width();
+      if (in_dialog && width > 768) {
+        if (dp.is(':visible')) {
+          dp.dialog('close');
+        }
+        dp.height('auto').removeClass('ui-dialog-content ui-widget-content')
+          .data('dialog-parent', dp.closest('.ui-dialog'))
+          .appendTo('#layout > div.sidebar');
+      }
+      else if (!in_dialog && dp.length && width <= 768 && dp.data('dialog-parent')) {
+        dp.addClass('ui-dialog-content ui-widget-content')
+          .insertAfter(dp.data('dialog-parent').find('.ui-dialog-titlebar'));
+      }
     }
   }).resize();
 
@@ -4269,4 +4322,76 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   // show toolbar
   $('#toolbar').show();
 
+  // Elastic mods
+  if ($('#calendar').data('elastic-mode')) {
+    var selector = $('<div class="btn-group btn-group-toggle" role="group">').appendTo('.fc-header-left'),
+        nav = $('<div class="btn-group btn-group-toggle" role="group">').appendTo('.fc-header-right');
+
+    $('.fc-header-left > span').each(function() {
+      var new_btn, cl = 'btn btn-secondary', btn = $(this),
+        activate = function(button) {
+          selector.children('.active').removeClass('active');
+          $(button).addClass('active');
+        };
+
+      if (btn.is('.fc-state-active')) {
+        cl += ' active';
+      }
+
+      new_btn = $('<button>').attr({'class': cl, type: 'button'}).text(btn.text())
+        .appendTo(selector)
+        .on('click', function() {
+          activate(this);
+          btn.click();
+        });
+
+      if (window.MutationObserver) {
+        // handle button active state changes
+        new MutationObserver(function() { if (btn.is('.fc-state-active')) activate(new_btn); }).observe(this, {attributes: true});
+      }
+    });
+
+    $.each(['prev', 'today', 'next'], function() {
+      var btn = $('.fc-header-right').find('.fc-button-' + this);
+      $('<button>').attr({'class': 'btn btn-secondary', type: 'button'})
+        .text(btn.text()).appendTo(nav).on('click', function() { btn.click(); });
+    });
+
+    $('#timezone-display').appendTo($('.fc-header-center')).removeClass('hidden');
+    $('#agendaoptions').detach().insertAfter('table.fc-header');
+
+    $('.content-frame-navigation a.button.date').appendTo('.content > .searchbar');
+
+    // Mobile header title
+    if (window.MutationObserver) {
+      var title = $('.fc-header-title'),
+        mobile_header = $('#layout > .content > .header > .header-title'),
+        callback = function() {
+          var text = title.text();
+          mobile_header.html('').append([
+            $('<span class="title">').text(text),
+            $('<span class="tz">').text($('#timezone-display').text())
+          ]);
+        };
+
+      // update the header when something changes on the calendar title
+      new MutationObserver(callback).observe(title[0], {childList: true, subtree: true});
+      // initialize the header
+      callback();
+    }
+
+    window.calendar_datepicker = function() {
+      $('#datepicker').dialog({
+        modal: true,
+        title: rcmail.gettext('calendar.selectdate'),
+        buttons: [{
+          text: rcmail.gettext('close', 'calendar'),
+          'class': 'cancel',
+          click: function() { $(this).dialog('close'); }
+        }],
+        width: 400,
+        height: 520
+      });
+    }
+  }
 });
diff --git a/plugins/calendar/composer.json b/plugins/calendar/composer.json
index 4ab48911..10335785 100644
--- a/plugins/calendar/composer.json
+++ b/plugins/calendar/composer.json
@@ -4,7 +4,7 @@
     "description": "Calendar plugin",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -12,7 +12,7 @@
             "role": "Lead"
         },
         {
-            "name": "Alensader Machniak",
+            "name": "Aleksander Machniak",
             "email": "machniak@kolabsys.com",
             "role": "Developer"
         }
@@ -26,6 +26,7 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libcalendaring": ">=3.2.8"
+        "kolab/libcalendaring": ">=3.4.0",
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/calendar/config.inc.php.dist b/plugins/calendar/config.inc.php.dist
index e9067766..f80d3eb0 100644
--- a/plugins/calendar/config.inc.php.dist
+++ b/plugins/calendar/config.inc.php.dist
@@ -82,6 +82,12 @@ $config['calendar_work_end'] = 18;
 // show line at current time of the day
 $config['calendar_time_indicator'] = true;
 
+// Display week numbers:
+// -1: don't display week numbers
+//  0: in datepicker only (default)
+//  1: in both datepicker and calendar
+$config['calendar_show_weekno'] = 0;
+
 // default alarm settings for new events.
 // this is only a preset when a new event dialog opens
 // possible values are <empty>, DISPLAY, EMAIL
@@ -138,8 +144,9 @@ $config['calendar_freebusy_trigger'] = false;
 $config['calendar_include_freebusy_data'] = 1;
 
 // SMTP server host used to send (anonymous) itip messages.
-// Set to '' in order to use PHP's mail() function for email delivery.
 // To override the SMTP port or connection method, provide a full URL like 'tls://somehost:587'
+// This will add a link to invitation messages to allow users from outside
+// to reply when their mail clients do not support iTip format.
 $config['calendar_itip_smtp_server'] = null;
 
 // SMTP username used to send (anonymous) itip messages
@@ -149,7 +156,7 @@ $config['calendar_itip_smtp_user'] = 'smtpauth';
 $config['calendar_itip_smtp_pass'] = '123456';
 
 // show virtual invitation calendars (Kolab driver only)
-$config['kolab_invitation_calendars'] = true;
+$config['kolab_invitation_calendars'] = false;
 
 // Base URL to build fully qualified URIs to access calendars via CALDAV
 // The following replacement variables are supported:
@@ -166,4 +173,9 @@ $config['kolab_invitation_calendars'] = true;
 // LDAP directory configuration to find avilable resources for events
 // $config['calendar_resources_directory'] = array(/* ldap_public-like address book configuration */);
 
+// Enables displaying of free-busy URL with token-based authentication
+// Set it to the prefix URL, e.g. 'https://hostname/freebusy' or just '/freebusy'.
+// See freebusy_session_auth in configuration of kolab_auth plugin.
+$config['calendar_freebusy_session_auth_url'] = null;
+
 ?>
diff --git a/plugins/calendar/drivers/calendar_driver.php b/plugins/calendar/drivers/calendar_driver.php
index 32586666..1cbeab02 100644
--- a/plugins/calendar/drivers/calendar_driver.php
+++ b/plugins/calendar/drivers/calendar_driver.php
@@ -101,6 +101,7 @@ abstract class calendar_driver
   const FILTER_PERSONAL      = 8;
   const FILTER_PRIVATE       = 16;
   const FILTER_CONFIDENTIAL  = 32;
+  const FILTER_SHARED        = 64;
   const BIRTHDAY_CALENDAR_ID = '__bdays__';
 
   // features supported by backend
@@ -531,17 +532,18 @@ abstract class calendar_driver
   /**
    * Get a list of property changes beteen two revisions of an event
    *
-   * @param array  $event Hash array with event properties:
+   * @param array $event Hash array with event properties:
    *         id: Event identifier
    *   calendar: Calendar identifier
-   * @param mixed  $rev   Revisions: "from:to"
+   * @param mixed $rev1 Old Revision
+   * @param mixed $rev2 New Revision
    *
    * @return array List of property changes, each as a hash array:
    *    property: Revision number
    *         old: Old property value
    *         new: Updated property value
    */
-  public function get_event_diff($event, $rev)
+  public function get_event_diff($event, $rev1, $rev2)
   {
     return false;
   }
@@ -632,9 +634,9 @@ abstract class calendar_driver
     $cache  = $rcmail->get_cache('calendar.birthdays', 'db', 3600);
     $cache->expunge();
 
-    $alarm_type = $rcmail->config->get('calendar_birthdays_alarm_type', '');
+    $alarm_type   = $rcmail->config->get('calendar_birthdays_alarm_type', '');
     $alarm_offset = $rcmail->config->get('calendar_birthdays_alarm_offset', '-1D');
-    $alarms = $alarm_type ? $alarm_offset . ':' . $alarm_type : null;
+    $alarms       = $alarm_type ? $alarm_offset . ':' . $alarm_type : null;
 
     // let the user select the address books to consider in prefs
     $selected_sources = $rcmail->config->get('calendar_birthday_adressbooks');
@@ -655,70 +657,56 @@ abstract class calendar_driver
 
       // iterate over (cached) contacts
       foreach (($cached ?: $abook->search('*', '', 2, true, true, array('birthday'))) as $contact) {
-        if (is_array($contact) && !empty($contact['birthday'])) {
-          try {
-            if (is_array($contact['birthday']))
-              $contact['birthday'] = reset($contact['birthday']);
+        $event = self::parse_contact($contact, $source);
 
-            $bday = $contact['birthday'] instanceof DateTime ? $contact['birthday'] :
-                      new DateTime($contact['birthday'], new DateTimezone('UTC'));
-            $birthyear = $bday->format('Y');
-          }
-          catch (Exception $e) {
-            rcube::raise_error(array(
-                'code' => 600, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => 'BIRTHDAY PARSE ERROR: ' . $e),
-              true, false);
-            continue;
+        if (empty($event)) {
+          continue;
+        }
+
+        // add stripped record to cache
+        if (empty($cached)) {
+          $cache_records[] = array(
+            'ID'       => $contact['ID'],
+            'name'     => $event['_displayname'],
+            'birthday' => $event['start']->format('Y-m-d'),
+          );
+        }
+
+        // filter by search term (only name is involved here)
+        if (!empty($search) && strpos(mb_strtolower($event['title']), $search) === false) {
+          continue;
+        }
+
+        $bday  = clone $event['start'];
+        $byear = $bday->format('Y');
+
+        // quick-and-dirty recurrence computation: just replace the year
+        $bday->setDate($year, $bday->format('n'), $bday->format('j'));
+        $bday->setTime(12, 0, 0);
+        $this_year = $year;
+
+        // date range reaches over multiple years: use end year if not in range
+        if (($bday > $end || $bday < $start) && $year2 != $year) {
+          $bday->setDate($year2, $bday->format('n'), $bday->format('j'));
+          $this_year = $year2;
+        }
+
+        // birthday is within requested range
+        if ($bday <= $end && $bday >= $start) {
+          unset($event['_displayname']);
+          $event['alarms'] = $alarms;
+
+          // if this is not the first occurence modify event details
+          // but not when this is "all birthdays feed" request
+          if ($year2 - $year < 10 && ($age = ($this_year - $byear))) {
+            $event['description'] = $rcmail->gettext(array('name' => 'birthdayage', 'vars' => array('age' => $age)), 'calendar');
+            $event['start']       = $bday;
+            $event['end']         = clone $bday;
+            unset($event['recurrence']);
           }
 
-          $display_name = rcube_addressbook::compose_display_name($contact);
-          $event_title = $rcmail->gettext(array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name)), 'calendar');
-
-          // add stripped record to cache
-          if (empty($cached)) {
-            $cache_records[] = array(
-              'ID' => $contact['ID'],
-              'name' => $display_name,
-              'birthday' => $bday->format('Y-m-d'),
-            );
-          }
-
-          // filter by search term (only name is involved here)
-          if (!empty($search) && strpos(mb_strtolower($event_title), $search) === false) {
-            continue;
-          }
-
-          // quick-and-dirty recurrence computation: just replace the year
-          $bday->setDate($year, $bday->format('n'), $bday->format('j'));
-          $bday->setTime(12, 0, 0);
-          $this_year = $year;
-
-          // date range reaches over multiple years: use end year if not in range
-          if (($bday > $end || $bday < $start) && $year2 != $year) {
-            $bday->setDate($year2, $bday->format('n'), $bday->format('j'));
-            $this_year = $year2;
-          }
-
-          // birthday is within requested range
-          if ($bday <= $end && $bday >= $start) {
-            $age = $this_year - $birthyear;
-            $event = array(
-              'id'          => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $this_year),
-              'calendar'    => self::BIRTHDAY_CALENDAR_ID,
-              'title'       => $event_title,
-              'description' => $rcmail->gettext(array('name' => 'birthdayage', 'vars' => array('age' => $age)), 'calendar'),
-              // Add more contact information to description block?
-              'allday'      => true,
-              'start'       => $bday,
-              'alarms'      => $alarms,
-            );
-            $event['end'] = clone $bday;
-            $event['end']->add(new DateInterval('PT1H'));
-
-            $events[] = $event;
-          }
+          // add the main instance
+          $events[] = $event;
         }
       }
 
@@ -742,49 +730,72 @@ abstract class calendar_driver
     $rcmail = rcmail::get_instance();
 
     if ($source && $contact_id && ($abook = $rcmail->get_address_book($source))) {
-      $contact = $abook->get_record($contact_id, true);
-
-      if (is_array($contact) && !empty($contact['birthday'])) {
-        try {
-          if (is_array($contact['birthday']))
-            $contact['birthday'] = reset($contact['birthday']);
-
-          $bday = $contact['birthday'] instanceof DateTime ? $contact['birthday'] :
-                    new DateTime($contact['birthday'], new DateTimezone('UTC'));
-          $birthyear = $bday->format('Y');
-        }
-        catch (Exception $e) {
-          rcube::raise_error(array(
-              'code' => 600, 'type' => 'php',
-              'file' => __FILE__, 'line' => __LINE__,
-              'message' => 'BIRTHDAY PARSE ERROR: ' . $e),
-            true, false);
-
-          return null;
-        }
-
-        $display_name = rcube_addressbook::compose_display_name($contact);
-        $event_title = $rcmail->gettext(array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name)), 'calendar');
-
-        $event = array(
-          'id'          => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $year),
-          'uid'         => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $birthyear),
-          'calendar'    => self::BIRTHDAY_CALENDAR_ID,
-          'title'       => $event_title,
-          'description' => '',
-          'allday'      => true,
-          'start'       => $bday,
-          'recurrence'  => array('FREQ' => 'YEARLY', 'INTERVAL' => 1),
-          'free_busy'   => 'free',
-        );
-        $event['end'] = clone $bday;
-        $event['end']->add(new DateInterval('PT1H'));
-
-        return $event;
+      if ($contact = $abook->get_record($contact_id, true)) {
+        return self::parse_contact($contact, $source);
       }
     }
+  }
 
-    return null;
+  /**
+   * Parse contact and create an event for its birthday
+   *
+   * @param array  $contact Contact data
+   * @param string $source  Addressbook source ID
+   *
+   * @return array Birthday event data
+   */
+  public static function parse_contact($contact, $source)
+  {
+    if (!is_array($contact)) {
+      return;
+    }
+
+    if (is_array($contact['birthday'])) {
+      $contact['birthday'] = reset($contact['birthday']);
+    }
+
+    if (empty($contact['birthday'])) {
+      return;
+    }
+
+    try {
+      $bday = $contact['birthday'];
+      if (!$bday instanceof DateTime) {
+        $bday = new DateTime($bday, new DateTimezone('UTC'));
+      }
+      $bday->_dateonly = true;
+    }
+    catch (Exception $e) {
+      rcube::raise_error(array(
+          'code' => 600, 'type' => 'php',
+          'file' => __FILE__, 'line' => __LINE__,
+          'message' => 'BIRTHDAY PARSE ERROR: ' . $e->getMessage()),
+        true, false);
+      return;
+    }
+
+    $rcmail       = rcmail::get_instance();
+    $birthyear    = $bday->format('Y');
+    $display_name = rcube_addressbook::compose_display_name($contact);
+    $label        = array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name));
+    $event_title  = $rcmail->gettext($label, 'calendar');
+    $uid          = rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $birthyear);
+
+    $event = array(
+      'id'           => $uid,
+      'uid'          => $uid,
+      'calendar'     => self::BIRTHDAY_CALENDAR_ID,
+      'title'        => $event_title,
+      'description'  => '',
+      'allday'       => true,
+      'start'        => $bday,
+      'end'          => clone $bday,
+      'recurrence'   => array('FREQ' => 'YEARLY', 'INTERVAL' => 1),
+      'free_busy'    => 'free',
+      '_displayname' => $display_name,
+    );
+
+    return $event;
   }
 
   /**
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 84b70f22..3930b96d 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -391,7 +391,7 @@ class database_driver extends calendar_driver
             if ($event['id'] == $master['id']) {
               $event += $old;
               $event['recurrence_id'] = $master['id'];
-              $event['_instance'] = libcalendaring::recurrence_instance_identifier($old);
+              $event['_instance'] = libcalendaring::recurrence_instance_identifier($old, $master['allday']);
               $event['isexception'] = 1;
               $event_id = $this->_insert_event($event);
               return $event_id;
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 3e13020d..8667b4da 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -130,7 +130,7 @@ class kolab_calendar extends kolab_storage_folder_api
   /**
    * Return color to display this calendar
    */
-  public function get_color()
+  public function get_color($default = null)
   {
     // color is defined in folder METADATA
     if ($color = $this->storage->get_color()) {
@@ -143,7 +143,7 @@ class kolab_calendar extends kolab_storage_folder_api
     if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
       return $prefs[$this->id]['color'];
 
-    return 'cc0000';
+    return $default ?: 'cc0000';
   }
 
   /**
@@ -201,21 +201,25 @@ class kolab_calendar extends kolab_storage_folder_api
       $instance_id = substr($id, strlen($master_id) + 1);
 
       if ($record = $this->storage->get_object($master_id)) {
-        $master = $this->_to_driver_event($record, true);
-        $this->events[$master_id] = $master;
+        $master = $this->_to_driver_event($record);
       }
 
       if ($master) {
         // check for match in top-level exceptions (aka loose single occurrences)
         if ($master['_formatobj'] && ($instance = $master['_formatobj']->get_instance($instance_id))) {
-          $this->events[$id] = $this->_to_driver_event($instance);
+          $this->events[$id] = $this->_to_driver_event($instance, false, true, $master);
         }
         // check for match on the first instance already
         else if ($master['_instance'] && $master['_instance'] == $instance_id) {
           $this->events[$id] = $master;
         }
         else if (is_array($master['recurrence'])) {
-          $this->get_recurring_events($record, $master['start'], null, $id);
+          // For performance reasons we'll get only the specific instance
+          if (($date = substr($id, strlen($master_id) + 1, 8)) && strlen($date) == 8 && is_numeric($date)) {
+            $start_date = new DateTime($date . 'T000000', $master['start']->getTimezone());
+          }
+
+          $this->get_recurring_events($record, $start_date ?: $master['start'], null, $id, 1);
         }
       }
     }
@@ -295,7 +299,9 @@ class kolab_calendar extends kolab_storage_folder_api
     }
 
     // set partstat filter to skip pending and declined invitations
-    if (empty($filter_query) && $this->get_namespace() != 'other') {
+    if (empty($filter_query) && $this->cal->rc->config->get('kolab_invitation_calendars')
+      && $this->get_namespace() != 'other'
+    ) {
       $partstat_exclude = array('NEEDS-ACTION','DECLINED');
     }
     else {
@@ -316,14 +322,16 @@ class kolab_calendar extends kolab_storage_folder_api
       if ($event['start'] <= $end && $event['end'] >= $start) {
         unset($event['_attendees']);
         $add = true;
-
         // skip the first instance of a recurring event if listed in exdate
         if ($virtual && !empty($event['recurrence']['EXDATE'])) {
           $event_date = $event['start']->format('Ymd');
-          $exdates = (array)$event['recurrence']['EXDATE'];
+          $event_tz   = $event['start']->getTimezone();
 
-          foreach ($exdates as $exdate) {
-            if ($exdate->format('Ymd') == $event_date) {
+          foreach ((array) $event['recurrence']['EXDATE'] as $exdate) {
+            $ex = clone $exdate;
+            $ex->setTimezone($event_tz);
+
+            if ($ex->format('Ymd') == $event_date) {
               $add = false;
               break;
             }
@@ -353,7 +361,7 @@ class kolab_calendar extends kolab_storage_folder_api
       // add top-level exceptions (aka loose single occurrences)
       else if (is_array($record['exceptions'])) {
         foreach ($record['exceptions'] as $ex) {
-          $component = $this->_to_driver_event($ex, false, false);
+          $component = $this->_to_driver_event($ex, false, false, $record);
           if ($component['start'] <= $end && $component['end'] >= $start) {
             $events[] = $component;
           }
@@ -593,32 +601,29 @@ class kolab_calendar extends kolab_storage_folder_api
   /**
    * Create instances of a recurring event
    *
-   * @param array  Hash array with event properties
-   * @param object DateTime Start date of the recurrence window
-   * @param object DateTime End date of the recurrence window
-   * @param string ID of a specific recurring event instance
+   * @param array    $event    Hash array with event properties
+   * @param DateTime $start    Start date of the recurrence window
+   * @param DateTime $end      End date of the recurrence window
+   * @param string   $event_id ID of a specific recurring event instance
+   * @param int      $limit    Max. number of instances to return
+   *
    * @return array List of recurring event instances
    */
-  public function get_recurring_events($event, $start, $end = null, $event_id = null)
+  public function get_recurring_events($event, $start, $end = null, $event_id = null, $limit = null)
   {
     $object = $event['_formatobj'];
     if (!$object) {
       $rec = $this->storage->get_object($event['id']);
       $object = $rec['_formatobj'];
     }
+
     if (!is_object($object))
       return array();
 
     // determine a reasonable end date if none given
     if (!$end) {
-      switch ($event['recurrence']['FREQ']) {
-        case 'YEARLY':  $intvl = 'P100Y'; break;
-        case 'MONTHLY': $intvl = 'P20Y';  break;
-        default:        $intvl = 'P10Y';  break;
-      }
-
       $end = clone $event['start'];
-      $end->add(new DateInterval($intvl));
+      $end->add(new DateInterval('P100Y'));
     }
 
     // copy the recurrence rule from the master event (to be used in the UI)
@@ -634,9 +639,9 @@ class kolab_calendar extends kolab_storage_folder_api
     if (is_array($event['recurrence']['EXCEPTIONS'])) {
       foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
         if (!$exception['_instance'])
-          $exception['_instance'] = libcalendaring::recurrence_instance_identifier($exception);
+          $exception['_instance'] = libcalendaring::recurrence_instance_identifier($exception, $event['allday']);
 
-        $rec_event = $this->_to_driver_event($exception, false, false);
+        $rec_event = $this->_to_driver_event($exception, false, false, $event);
         $rec_event['id'] = $event['uid'] . '-' . $exception['_instance'];
         $rec_event['isexception'] = 1;
 
@@ -663,34 +668,53 @@ class kolab_calendar extends kolab_storage_folder_api
       return array($this->events[$event_id]);
     }
 
+    // Check first occurrence, it might have been moved
+    if ($first = $exdata[$event['start']->format('Ymd')]) {
+      // return it only if not already in the result, but in the requested period
+      if (!($event['start'] <= $end && $event['end'] >= $start)
+        && ($first['start'] <= $end && $first['end'] >= $start)
+      ) {
+          $events[] = $first;
+      }
+    }
+
+    if ($limit && count($events) >= $limit) {
+      return $events;
+    }
+
     // use libkolab to compute recurring events
-    if (class_exists('kolabcalendaring')) {
-        $recurrence = new kolab_date_recurrence($object);
-    }
-    else {
-      // fallback to local recurrence implementation
-      require_once($this->cal->home . '/lib/calendar_recurrence.php');
-      $recurrence = new calendar_recurrence($this->cal, $event);
-    }
+    $recurrence = new kolab_date_recurrence($object);
 
     $i = 0;
     while ($next_event = $recurrence->next_instance()) {
-      $datestr = $next_event['start']->format('Ymd');
+      $datestr     = $next_event['start']->format('Ymd');
       $instance_id = $next_event['start']->format($recurrence_id_format);
 
       // use this event data for future recurring instances
       if ($futuredata[$datestr])
         $overlay_data = $futuredata[$datestr];
 
+      $rec_id      = $event['uid'] . '-' . $instance_id;
+      $exception   = $exdata[$datestr] ?: $overlay_data;
+      $event_start = $next_event['start'];
+      $event_end   = $next_event['end'];
+
+      // copy some event from exception to get proper start/end dates
+      if ($exception) {
+        $event_copy = $next_event;
+        kolab_driver::merge_exception_dates($event_copy, $exception);
+        $event_start = $event_copy['start'];
+        $event_end   = $event_copy['end'];
+      }
+
       // add to output if in range
-      $rec_id = $event['uid'] . '-' . $instance_id;
-      if (($next_event['start'] <= $end && $next_event['end'] >= $start) || ($event_id && $rec_id == $event_id)) {
-        $rec_event = $this->_to_driver_event($next_event, false, false);
+      if (($event_start <= $end && $event_end >= $start) || ($event_id && $rec_id == $event_id)) {
+        $rec_event = $this->_to_driver_event($next_event, false, false, $event);
         $rec_event['_instance'] = $instance_id;
         $rec_event['_count'] = $i + 1;
 
-        if ($overlay_data || $exdata[$datestr])  // copy data from exception
-          kolab_driver::merge_exception_data($rec_event, $exdata[$datestr] ?: $overlay_data);
+        if ($exception)  // copy data from exception
+          kolab_driver::merge_exception_data($rec_event, $exception);
 
         $rec_event['id'] = $rec_id;
         $rec_event['recurrence_id'] = $event['uid'];
@@ -702,22 +726,26 @@ class kolab_calendar extends kolab_storage_folder_api
           $this->events[$rec_id] = $rec_event;
           break;
         }
+
+        if ($limit && count($events) >= $limit) {
+          return $events;
+        }
       }
       else if ($next_event['start'] > $end)  // stop loop if out of range
         break;
 
       // avoid endless recursion loops
-      if (++$i > 1000)
+      if (++$i > 100000)
           break;
     }
-    
+
     return $events;
   }
 
   /**
    * Convert from Kolab_Format to internal representation
    */
-  private function _to_driver_event($record, $noinst = false, $links = true)
+  private function _to_driver_event($record, $noinst = false, $links = true, $master_event = null)
   {
     $record['calendar'] = $this->id;
 
@@ -725,13 +753,22 @@ class kolab_calendar extends kolab_storage_folder_api
       $record['links'] = $this->get_links($record['uid']);
     }
 
-    if ($this->get_namespace() == 'other') {
+    $ns = $this->get_namespace();
+
+    if ($ns == 'other') {
       $record['className'] = 'fc-event-ns-other';
-      $record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION','DECLINED'), $this->get_owner());
+    }
+
+    if ($ns == 'other' || !$this->cal->rc->config->get('kolab_invitation_calendars')) {
+      $record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION', 'DECLINED'), $this->get_owner());
+
+      // Modify invitation status class name, when invitation calendars are disabled
+      // we'll use opacity only for declined/needs-action events
+      $record['className'] = str_replace('-invitation', '', $record['className']);
     }
 
     // add instance identifier to first occurrence (master event)
-    $recurrence_id_format = libcalendaring::recurrence_id_format($record);
+    $recurrence_id_format = libcalendaring::recurrence_id_format($master_event ? $master_event : $record);
     if (!$noinst && $record['recurrence'] && !$record['recurrence_id'] && !$record['_instance']) {
       $record['_instance'] = $record['start']->format($recurrence_id_format);
     }
@@ -756,11 +793,25 @@ class kolab_calendar extends kolab_storage_folder_api
   private function _from_driver_event($event, $old = array())
   {
     // set current user as ORGANIZER
-    $identity = $this->cal->rc->user->list_emails(true);
-    if (empty($event['attendees']) && $identity['email'])
-      $event['attendees'] = array(array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email']));
+    if ($identity = $this->cal->rc->user->list_emails(true)) {
+      $event['attendees'] = (array) $event['attendees'];
+      $found = false;
 
-    $event['_owner'] = $identity['email'];
+      // there can be only resources on attendees list (T1484)
+      // let's check the existence of an organizer
+      foreach ($event['attendees'] as $attendee) {
+        if ($attendee['role'] == 'ORGANIZER') {
+          $found = true;
+          break;
+        }
+      }
+
+      if (!$found) {
+        $event['attendees'][] = array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email']);
+      }
+
+      $event['_owner'] = $identity['email'];
+    }
 
     // remove EXDATE values if RDATE is given
     if (!empty($event['recurrence']['RDATE'])) {
@@ -785,7 +836,6 @@ class kolab_calendar extends kolab_storage_folder_api
       });
     }
 
-
     // remove some internal properties which should not be saved
     unset($event['_savemode'], $event['_fromcalendar'], $event['_identity'], $event['_folder_id'],
       $event['recurrence_id'], $event['attachments'], $event['deleted_attachments'], $event['className']);
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 0eafc3bd..c717461e 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -221,7 +221,7 @@ class kolab_driver extends calendar_driver
     }
 
     // list virtual calendars showing invitations
-    if ($this->rc->config->get('kolab_invitation_calendars')) {
+    if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
       foreach (array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED) as $id) {
         $cal = new kolab_invitation_calendar($id, $this->cal);
         $this->calendars[$cal->id] = $cal;
@@ -256,7 +256,7 @@ class kolab_driver extends calendar_driver
     }
 
     // append the virtual birthdays calendar
-    if ($this->rc->config->get('calendar_contact_birthdays', false)) {
+    if ($this->rc->config->get('calendar_contact_birthdays', false) && !($filter & self::FILTER_INSERTABLE)) {
       $id = self::BIRTHDAY_CALENDAR_ID;
       $prefs = $this->rc->config->get('kolab_calendars', array());  // read local prefs
       if (!($filter & self::FILTER_ACTIVE) || $prefs[$id]['active']) {
@@ -296,16 +296,15 @@ class kolab_driver extends calendar_driver
       'list'      => $this->calendars,
       'calendars' => $calendars,
       'filter'    => $filter,
-      'editable'  => ($filter & self::FILTER_WRITEABLE),
-      'insert'    => ($filter & self::FILTER_INSERTABLE),
-      'active'    => ($filter & self::FILTER_ACTIVE),
-      'personal'  => ($filter & self::FILTER_PERSONAL)
     ));
 
     if ($plugin['abort']) {
       return $plugin['calendars'];
     }
 
+    $personal = $filter & self::FILTER_PERSONAL;
+    $shared   = $filter & self::FILTER_SHARED;
+
     foreach ($this->calendars as $cal) {
       if (!$cal->ready) {
         continue;
@@ -313,7 +312,7 @@ class kolab_driver extends calendar_driver
       if (($filter & self::FILTER_WRITEABLE) && !$cal->editable) {
         continue;
       }
-      if (($filter & self::FILTER_INSERTABLE) && !$cal->insert) {
+      if (($filter & self::FILTER_INSERTABLE) && !$cal->editable) {
         continue;
       }
       if (($filter & self::FILTER_ACTIVE) && !$cal->is_active()) {
@@ -325,9 +324,13 @@ class kolab_driver extends calendar_driver
       if (($filter & self::FILTER_CONFIDENTIAL) && $cal->subtype != 'confidential') {
         continue;
       }
-      if (($filter & self::FILTER_PERSONAL) && $cal->get_namespace() != 'personal') {
-        continue;
+      if ($personal || $shared) {
+        $ns = $cal->get_namespace();
+        if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
+          continue;
+        }
       }
+
       $calendars[$cal->id] = $cal;
     }
 
@@ -816,7 +819,7 @@ class kolab_driver extends calendar_driver
 
           // removing the first instance => just move to next occurence
           if ($master['recurrence'] && $event['_instance'] == libcalendaring::recurrence_instance_identifier($master)) {
-            $recurring = reset($storage->get_recurring_events($event, $event['start'], null, $event['id'].'-1'));
+            $recurring = reset($storage->get_recurring_events($event, $event['start'], null, $event['id'] . '-1', 1));
 
             // no future instances found: delete the master event (bug #1677)
             if (!$recurring['start']) {
@@ -897,7 +900,7 @@ class kolab_driver extends calendar_driver
           break;
       }
     }
-    
+
     if ($success && $this->freebusy_trigger)
       $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
 
@@ -979,6 +982,15 @@ class kolab_driver extends calendar_driver
       // force 'current' mode for single occurrences stored as exception
       else if (!$old['recurrence'] && !$old['recurrence_id'] && $old['isexception'])
         $savemode = 'current';
+
+      // Stick to the master timezone for all occurrences (Bifrost#T104637)
+      $master_tz = $master['start']->getTimezone();
+      $event_tz  = $event['start']->getTimezone();
+
+      if ($master_tz->getName() != $event_tz->getName()) {
+        $event['start']->setTimezone($master_tz);
+        $event['end']->setTimezone($master_tz);
+      }
     }
 
     // check if update affects scheduling and update attendee status accordingly
@@ -1138,23 +1150,23 @@ class kolab_driver extends calendar_driver
         // use start date from master but try to be smart on time or duration changes
         $old_start_date = $old['start']->format('Y-m-d');
         $old_start_time = $old['allday'] ? '' : $old['start']->format('H:i');
-        $old_duration = $old['end']->format('U') - $old['start']->format('U');
-        
+        $old_duration   = self::event_duration($old['start'], $old['end'], $old['allday']);
+
         $new_start_date = $event['start']->format('Y-m-d');
         $new_start_time = $event['allday'] ? '' : $event['start']->format('H:i');
-        $new_duration = $event['end']->format('U') - $event['start']->format('U');
-        
+        $new_duration   = self::event_duration($event['start'], $event['end'], $event['allday']);
+
         $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
         $date_shift = $old['start']->diff($event['start']);
-        
+
         // shifted or resized
         if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
           $event['start'] = $master['start']->add($date_shift);
           $event['end'] = clone $event['start'];
-          $event['end']->add(new DateInterval('PT'.$new_duration.'S'));
-          
+          $event['end']->add(new DateInterval($new_duration));
+
           // remove fixed weekday, will be re-set to the new weekday in kolab_calendar::update_event()
-          if ($old_start_date != $new_start_date) {
+          if ($old_start_date != $new_start_date && $event['recurrence']) {
             if (strlen($event['recurrence']['BYDAY']) == 2)
               unset($event['recurrence']['BYDAY']);
             if ($old['recurrence']['BYMONTH'] == $old['start']->format('n'))
@@ -1170,6 +1182,7 @@ class kolab_driver extends calendar_driver
         // when saving an instance in 'all' mode, copy recurrence exceptions over
         if ($old['recurrence_id']) {
           $event['recurrence']['EXCEPTIONS'] = $master['recurrence']['EXCEPTIONS'];
+          $event['recurrence']['EXDATE']     = $master['recurrence']['EXDATE'];
         }
         else if ($master['_instance']) {
           $event['_instance'] = $master['_instance'];
@@ -1222,10 +1235,23 @@ class kolab_driver extends calendar_driver
 
     if ($success && $this->freebusy_trigger)
       $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
-    
+
     return $success;
   }
 
+  /**
+   * Calculate event duration, returns string in DateInterval format
+   */
+  protected static function event_duration($start, $end, $allday = false)
+  {
+    if ($allday) {
+      $diff = $start->diff($end);
+      return 'P' . $diff->days . 'D';
+    }
+
+    return 'PT' . ($end->format('U') - $start->format('U')) . 'S';
+  }
+
   /**
    * Determine whether the current change affects scheduling and reset attendee status accordingly
    */
@@ -1358,7 +1384,7 @@ class kolab_driver extends calendar_driver
     }
 
     if (!$event['_instance'] && is_a($event['recurrence_date'], 'DateTime')) {
-      $event['_instance'] = libcalendaring::recurrence_instance_identifier($event);
+      $event['_instance'] = libcalendaring::recurrence_instance_identifier($event, $master['allday']);
     }
 
     if (!is_array($master['exceptions']) && is_array($master['recurrence']['EXCEPTIONS'])) {
@@ -1390,7 +1416,6 @@ class kolab_driver extends calendar_driver
     }
   }
 
-
   /**
    * Merge certain properties from the overlay event to the base event object
    *
@@ -1405,25 +1430,9 @@ class kolab_driver extends calendar_driver
     if (is_array($blacklist))
       $forbidden = array_merge($forbidden, $blacklist);
 
-    // compute date offset from the exception
-    if ($overlay['start'] instanceof DateTime && $overlay['recurrence_date'] instanceof DateTime) {
-      $date_offset = $overlay['recurrence_date']->diff($overlay['start']);
-    }
-
     foreach ($overlay as $prop => $value) {
       if ($prop == 'start' || $prop == 'end') {
-        if (is_object($event[$prop]) && $event[$prop] instanceof DateTime) {
-          // set date value if overlay is an exception of the current instance
-          if (substr($overlay['_instance'], 0, 8) == substr($event['_instance'], 0, 8)) {
-            $event[$prop]->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
-          }
-          // apply date offset
-          else if ($date_offset) {
-            $event[$prop]->add($date_offset);
-          }
-          // adjust time of the recurring event instance
-          $event[$prop]->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
-        }
+        // handled by merge_exception_dates() below
       }
       else if ($prop == 'thisandfuture' && $overlay['_instance'] == $event['_instance']) {
         $event[$prop] = $value;
@@ -1431,6 +1440,38 @@ class kolab_driver extends calendar_driver
       else if ($prop[0] != '_' && !in_array($prop, $forbidden))
         $event[$prop] = $value;
     }
+
+    self::merge_exception_dates($event, $overlay);
+  }
+
+  /**
+   * Merge start/end date from the overlay event to the base event object
+   *
+   * @param array The event object to be altered
+   * @param array The overlay event object to be merged over $event
+   */
+  public static function merge_exception_dates(&$event, $overlay)
+  {
+    // compute date offset from the exception
+    if ($overlay['start'] instanceof DateTime && $overlay['recurrence_date'] instanceof DateTime) {
+      $date_offset = $overlay['recurrence_date']->diff($overlay['start']);
+    }
+
+    foreach (array('start', 'end') as $prop) {
+      $value = $overlay[$prop];
+      if (is_object($event[$prop]) && $event[$prop] instanceof DateTime) {
+        // set date value if overlay is an exception of the current instance
+        if (substr($overlay['_instance'], 0, 8) == substr($event['_instance'], 0, 8)) {
+          $event[$prop]->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
+        }
+        // apply date offset
+        else if ($date_offset) {
+          $event[$prop]->add($date_offset);
+        }
+        // adjust time of the recurring event instance
+        $event[$prop]->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
+      }
+    }
   }
 
   /**
@@ -1652,15 +1693,14 @@ class kolab_driver extends calendar_driver
       $event = $storage->get_event($event['id']);
     }
 
-    if ($event && !empty($event['_attachments'])) {
-      foreach ($event['_attachments'] as $att) {
+    if ($event) {
+      $attachments = isset($event['_attachments']) ? $event['_attachments'] : $event['attachments'];
+      foreach ((array) $attachments as $att) {
         if ($att['id'] == $id) {
           return $att;
         }
       }
     }
-
-    return null;
   }
 
   /**
@@ -1753,15 +1793,15 @@ class kolab_driver extends calendar_driver
    */
   private function get_recurrence_count($event, $dtstart)
   {
+    // load the given event data into a libkolabxml container
+    if (!$event['_formatobj']) {
+      $event_xml = new kolab_format_event();
+      $event_xml->set($event);
+      $event['_formatobj'] = $event_xml;
+    }
+
     // use libkolab to compute recurring events
-    if (class_exists('kolabcalendaring') && $event['_formatobj']) {
-        $recurrence = new kolab_date_recurrence($event['_formatobj']);
-    }
-    else {
-      // fallback to local recurrence implementation
-      require_once($this->cal->home . '/lib/calendar_recurrence.php');
-      $recurrence = new calendar_recurrence($this->cal, $event);
-    }
+    $recurrence = new kolab_date_recurrence($event['_formatobj']);
 
     $count = 0;
     while (($next_event = $recurrence->next_instance()) && $next_event['start'] <= $dtstart && $count < 1000) {
@@ -1972,46 +2012,7 @@ class kolab_driver extends calendar_driver
    */
   public static function from_rcube_event($event, $old = array())
   {
-    // in kolab_storage attachments are indexed by content-id
-    if (is_array($event['attachments']) || !empty($event['deleted_attachments'])) {
-      $event['_attachments'] = array();
-
-      foreach ($event['attachments'] as $attachment) {
-        $key = null;
-        // Roundcube ID has nothing to do with the storage ID, remove it
-        if ($attachment['content'] || $attachment['path']) {
-          unset($attachment['id']);
-        }
-        else {
-          foreach ((array)$old['_attachments'] as $cid => $oldatt) {
-            if ($attachment['id'] == $oldatt['id'])
-              $key = $cid;
-          }
-        }
-
-        // flagged for deletion => set to false
-        if ($attachment['_deleted'] || in_array($attachment['id'], (array)$event['deleted_attachments'])) {
-          $event['_attachments'][$key] = false;
-        }
-        // replace existing entry
-        else if ($key) {
-          $event['_attachments'][$key] = $attachment;
-        }
-        // append as new attachment
-        else {
-          $event['_attachments'][] = $attachment;
-        }
-      }
-
-      $event['_attachments'] = array_merge((array)$old['_attachments'], $event['_attachments']);
-
-      // attachments flagged for deletion => set to false
-      foreach ($event['_attachments'] as $key => $attachment) {
-        if ($attachment['_deleted'] || in_array($attachment['id'], (array)$event['deleted_attachments'])) {
-          $event['_attachments'][$key] = false;
-        }
-      }
-    }
+    kolab_format::merge_attachments($event, $old);
 
     return $event;
   }
@@ -2333,7 +2334,14 @@ class kolab_driver extends calendar_driver
     if (in_array($calendar['id'], array(self::BIRTHDAY_CALENDAR_ID, self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
       if ($calendar['id'] != self::BIRTHDAY_CALENDAR_ID)
         unset($formfields['showalarms']);
-      return parent::calendar_form($action, $calendar, $formfields);
+
+      // General tab
+      $form['props'] = array(
+        'name'   => $this->rc->gettext('properties'),
+        'fields' => $formfields,
+      );
+
+      return kolab_utils::folder_form($form, '', 'calendar');
     }
 
     $this->_read_calendars();
@@ -2366,7 +2374,8 @@ class kolab_driver extends calendar_driver
 
     // General tab
     $form['props'] = array(
-      'name' => $this->rc->gettext('properties'),
+      'name'   => $this->rc->gettext('properties'),
+      'fields' => array(),
     );
 
     // Disable folder name input
@@ -2377,12 +2386,7 @@ class kolab_driver extends calendar_driver
     }
 
     // calendar name (default field)
-    $form['props']['fieldsets']['location'] = array(
-      'name'  => $this->rc->gettext('location'),
-      'content' => array(
-        'name' => $formfields['name']
-      ),
-    );
+    $form['props']['fields']['location'] = $formfields['name'];
 
     if (!empty($options) && ($options['norename'] || $options['protected'])) {
       // prevent user from moving folder
@@ -2390,7 +2394,7 @@ class kolab_driver extends calendar_driver
     }
     else {
       $select = kolab_storage::folder_selector('event', array('name' => 'parent', 'id' => 'calendar-parent'), $folder);
-      $form['props']['fieldsets']['location']['content']['path'] = array(
+      $form['props']['fields']['path'] = array(
         'id' => 'calendar-parent',
         'label' => $this->cal->gettext('parentcalendar'),
         'value' => $select->show(strlen($folder) ? $path_imap : ''),
@@ -2398,138 +2402,10 @@ class kolab_driver extends calendar_driver
     }
 
     // calendar color (default field)
-    $form['props']['fieldsets']['settings'] = array(
-      'name'  => $this->rc->gettext('settings'),
-      'content' => array(
-        'color' => $formfields['color'],
-        'showalarms' => $formfields['showalarms'],
-      ),
-    );
-    
-    
-    if ($action != 'form-new') {
-      $form['sharing'] = array(
-          'name'    => rcube::Q($this->cal->gettext('tabsharing')),
-          'content' => html::tag('iframe', array(
-            'src' => $this->cal->rc->url(array('_action' => 'calendar-acl', 'id' => $calendar['id'], 'framed' => 1)),
-            'width' => '100%',
-            'height' => 350,
-            'border' => 0,
-            'style' => 'border:0'),
-        ''),
-      );
-    }
+    $form['props']['fields']['color']  = $formfields['color'];
+    $form['props']['fields']['alarms'] = $formfields['showalarms'];
 
-    $this->form_html = '';
-    if (is_array($hidden_fields)) {
-        foreach ($hidden_fields as $field) {
-            $hiddenfield = new html_hiddenfield($field);
-            $this->form_html .= $hiddenfield->show() . "\n";
-        }
-    }
-
-    // Create form output
-    foreach ($form as $tab) {
-      if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
-        $content = '';
-        foreach ($tab['fieldsets'] as $fieldset) {
-          $subcontent = $this->get_form_part($fieldset);
-          if ($subcontent) {
-            $content .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($fieldset['name'])) . $subcontent) ."\n";
-          }
-        }
-      }
-      else {
-        $content = $this->get_form_part($tab);
-      }
-
-      if ($content) {
-        $this->form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) ."\n";
-      }
-    }
-
-    // Parse form template for skin-dependent stuff
-    $this->rc->output->add_handler('calendarform', array($this, 'calendar_form_html'));
-    return $this->rc->output->parse('calendar.kolabform', false, false);
-  }
-
-  /**
-   * Handler for template object
-   */
-  public function calendar_form_html()
-  {
-    return $this->form_html;
-  }
-
-  /**
-   * Helper function used in calendar_form_content(). Creates a part of the form.
-   */
-  private function get_form_part($form)
-  {
-    $content = '';
-
-    if (is_array($form['content']) && !empty($form['content'])) {
-      $table = new html_table(array('cols' => 2));
-      foreach ($form['content'] as $col => $colprop) {
-        $label = !empty($colprop['label']) ? $colprop['label'] : $this->cal->gettext($col);
-
-        $table->add('title', html::label($colprop['id'], rcube::Q($label)));
-        $table->add(null, $colprop['value']);
-      }
-      $content = $table->show();
-    }
-    else {
-      $content = $form['content'];
-    }
-
-    return $content;
-  }
-
-
-  /**
-   * Handler to render ACL form for a calendar folder
-   */
-  public function calendar_acl()
-  {
-    $this->rc->output->add_handler('folderacl', array($this, 'calendar_acl_form'));
-    $this->rc->output->send('calendar.kolabacl');
-  }
-
-  /**
-   * Handler for ACL form template object
-   */
-  public function calendar_acl_form()
-  {
-    $calid = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-    if ($calid && ($cal = $this->get_calendar($calid))) {
-      $folder = $cal->get_realname(); // UTF7
-      $color  = $cal->get_color();
-    }
-    else {
-      $folder = '';
-      $color  = '';
-    }
-
-    $storage = $this->rc->get_storage();
-    $delim   = $storage->get_hierarchy_delimiter();
-    $form   = array();
-
-    if (strlen($folder)) {
-      $path_imap = explode($delim, $folder);
-      array_pop($path_imap);  // pop off name part
-      $path_imap = implode($path_imap, $delim);
-
-      $options = $storage->folder_info($folder);
-
-      // Allow plugins to modify the form content (e.g. with ACL form)
-      $plugin = $this->rc->plugins->exec_hook('calendar_form_kolab',
-        array('form' => $form, 'options' => $options, 'name' => $folder));
-    }
-
-    if (!$plugin['form']['sharing']['content'])
-        $plugin['form']['sharing']['content'] = html::div('hint', $this->cal->gettext('aclnorights'));
-
-    return $plugin['form']['sharing']['content'];
+    return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
   }
 
   /**
diff --git a/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php b/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
index b41e2964..ac676796 100644
--- a/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
@@ -234,7 +234,7 @@ class kolab_invitation_calendar
     $events = array();
     foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
       $cal = $this->_get_calendar($foldername);
-      if ($cal->get_namespace() == 'other')
+      if (!$cal || $cal->get_namespace() == 'other')
         continue;
 
       foreach ($cal->list_events($start, $end, $search, 1, $query, array(array($subquery, 'OR'))) as $event) {
@@ -288,7 +288,7 @@ class kolab_invitation_calendar
     $count = 0;
     foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
       $cal = $this->_get_calendar($foldername);
-      if ($cal->get_namespace() == 'other')
+      if (!$cal || $cal->get_namespace() == 'other')
         continue;
 
       $count += $cal->count_events($start, $end, $filter);
diff --git a/plugins/calendar/drivers/kolab/kolab_user_calendar.php b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
index 84f159bf..185b6099 100644
--- a/plugins/calendar/drivers/kolab/kolab_user_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_user_calendar.php
@@ -38,7 +38,8 @@ class kolab_user_calendar extends kolab_calendar
    */
   public function __construct($user_or_folder, $calendar)
   {
-    $this->cal = $calendar;
+    $this->cal  = $calendar;
+    $this->imap = $calendar->rc->get_storage();
 
     // full user record is provided
     if (is_array($user_or_folder)) {
@@ -84,9 +85,11 @@ class kolab_user_calendar extends kolab_calendar
   /**
    * Getter for the IMAP folder owner
    *
+   * @param bool Return a fully qualified owner name (unused)
+   *
    * @return string Name of the folder owner
    */
-  public function get_owner()
+  public function get_owner($fully_qualified = false)
   {
     return $this->userdata['mail'];
   }
@@ -122,7 +125,7 @@ class kolab_user_calendar extends kolab_calendar
   /**
    * Return color to display this calendar
    */
-  public function get_color()
+  public function get_color($default = null)
   {
     // calendar color is stored in local user prefs
     $prefs = $this->cal->rc->config->get('kolab_calendars', array());
@@ -130,7 +133,7 @@ class kolab_user_calendar extends kolab_calendar
     if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
       return $prefs[$this->id]['color'];
 
-    return 'cc0000';
+    return $default ?: 'cc0000';
   }
 
   /**
@@ -195,9 +198,11 @@ class kolab_user_calendar extends kolab_calendar
    * @param  string  Search query (optional)
    * @param  boolean Include virtual events (optional)
    * @param  array   Additional parameters to query storage
+   * @param  array   Additional query to filter events
+   *
    * @return array A list of event records
    */
-  public function list_events($start, $end, $search = null, $virtual = 1, $query = array())
+  public function list_events($start, $end, $search = null, $virtual = 1, $query = array(), $filter_query = null)
   {
     // convert to DateTime for comparisons
     try {
@@ -223,12 +228,13 @@ class kolab_user_calendar extends kolab_calendar
       }
     }
 
-    // aggregate all calendar folders the user shares (but are not subscribed)
-    foreach (kolab_storage::list_user_folders($this->userdata, 'event', false) as $foldername) {
+    // aggregate all calendar folders the user shares (but are not activated)
+    foreach (kolab_storage::list_user_folders($this->userdata, 'event', 2) as $foldername) {
       $cal = new kolab_calendar($foldername, $this->cal);
       foreach ($cal->list_events($start, $end, $search, 1) as $event) {
-        $this->events[$event['id']] = $event;
-        $this->timeindex[$this->time_key($event)] = $event['id'];
+        $uid = $event['id'] ?: $event['uid'];
+        $this->events[$uid] = $event;
+        $this->timeindex[$this->time_key($event)] = $uid;
       }
     }
 
@@ -257,9 +263,10 @@ class kolab_user_calendar extends kolab_calendar
    *
    * @param  integer Date range start (unix timestamp)
    * @param  integer Date range end (unix timestamp)
+   * @param  array   Additional query to filter events
    * @return integer Count
    */
-  public function count_events($start, $end = null)
+  public function count_events($start, $end = null, $filter_query = null)
   {
     // not implemented
     return 0;
@@ -316,7 +323,7 @@ class kolab_user_calendar extends kolab_calendar
       'X-OUT-OF-OFFICE' => $this->cal->gettext('availoutofoffice'),
     );
 
-    // console('_fetch_freebusy', kolab_storage::get_freebusy_url($this->userdata['mail']), $fbdata);
+    // rcube::console('_fetch_freebusy', kolab_storage::get_freebusy_url($this->userdata['mail']), $fbdata);
 
     // parse free-busy information
     $count = 0;
@@ -332,7 +339,7 @@ class kolab_user_calendar extends kolab_calendar
         foreach ($fb['periods'] as $tuple) {
           list($from, $to, $type) = $tuple;
           $event = array(
-            'id'        => md5($this->id . $from->format('U') . '/' . $to->format('U')),
+            'uid'       => md5($this->id . $from->format('U') . '/' . $to->format('U')),
             'calendar'  => $this->id,
             'changed'   => $fb['created'] ?: new DateTime(),
             'title'     => $this->get_name() . ' ' . ($titlemap[$type] ?: $type),
@@ -349,8 +356,8 @@ class kolab_user_calendar extends kolab_calendar
           // avoid duplicate entries
           $key = $this->time_key($event);
           if (!$this->timeindex[$key]) {
-            $this->events[$event['id']] = $event;
-            $this->timeindex[$key] = $event['id'];
+            $this->events[$event['uid']] = $event;
+            $this->timeindex[$key] = $event['uid'];
             $count++;
           }
         }
@@ -365,7 +372,7 @@ class kolab_user_calendar extends kolab_calendar
    */
   private function time_key($event)
   {
-    return sprintf('%s/%s', $event['start']->format('U'), is_object($event['end']->format('U')) ?: '0');
+    return sprintf('%s/%s', $event['start']->format('U'), is_object($event['end']) ? $event['end']->format('U') : '0');
   }
 
   /**
@@ -412,15 +419,4 @@ class kolab_user_calendar extends kolab_calendar
   {
     return false;
   }
-
-  /**
-   * Convert from Kolab_Format to internal representation
-   */
-  private function _to_rcube_event($record)
-  {
-    $record['id'] = $record['uid'];
-    $record['calendar'] = $this->id;
-
-    return kolab_driver::to_rcube_event($record);
-  }
 }
diff --git a/plugins/calendar/helpdocs/en_US/_static/kolab/calendar-print.png b/plugins/calendar/helpdocs/en_US/_static/kolab/calendar-print.png
new file mode 120000
index 00000000..cd77cfec
--- /dev/null
+++ b/plugins/calendar/helpdocs/en_US/_static/kolab/calendar-print.png
@@ -0,0 +1 @@
+../larry/calendar-print.png
\ No newline at end of file
diff --git a/plugins/calendar/helpdocs/en_US/_static/kolab/calendar-toolbar.png b/plugins/calendar/helpdocs/en_US/_static/kolab/calendar-toolbar.png
new file mode 100644
index 00000000..79cb76bd
Binary files /dev/null and b/plugins/calendar/helpdocs/en_US/_static/kolab/calendar-toolbar.png differ
diff --git a/plugins/calendar/helpdocs/en_US/_static/larry/calendar-print.png b/plugins/calendar/helpdocs/en_US/_static/larry/calendar-print.png
new file mode 100644
index 00000000..8ea7fbb3
Binary files /dev/null and b/plugins/calendar/helpdocs/en_US/_static/larry/calendar-print.png differ
diff --git a/plugins/calendar/helpdocs/en_US/_static/larry/calendar-toolbar.png b/plugins/calendar/helpdocs/en_US/_static/larry/calendar-toolbar.png
new file mode 100644
index 00000000..1fdad6eb
Binary files /dev/null and b/plugins/calendar/helpdocs/en_US/_static/larry/calendar-toolbar.png differ
diff --git a/plugins/calendar/helpdocs/en_US/index.rst b/plugins/calendar/helpdocs/en_US/index.rst
index ce882167..96e3b197 100644
--- a/plugins/calendar/helpdocs/en_US/index.rst
+++ b/plugins/calendar/helpdocs/en_US/index.rst
@@ -14,5 +14,6 @@ The *Calendar* gives you access to your personal and shared calendar and schedul
    manage
    invitations
    importexport
+   printing
    sharing
 
diff --git a/plugins/calendar/helpdocs/en_US/invitations.rst b/plugins/calendar/helpdocs/en_US/invitations.rst
index f23c13a4..9a47c8a7 100644
--- a/plugins/calendar/helpdocs/en_US/invitations.rst
+++ b/plugins/calendar/helpdocs/en_US/invitations.rst
@@ -29,6 +29,8 @@ In case you accept, by either clicking *Accept* or *Maybe*, this will also copy
 the event into your personal calendar. The selector right next to the buttons lets you
 choose the right one.
 
+.. note:: It is sometimes useful (especially when declining or delegating an event) to respond without saving the event in your calendar. To do this use "--" entry in calendars selector.
+
 The copy in your calendar now knows about the invitation and its original sender. If you now
 delete it from your calendar, you'll be asked whether this should send a declination
 message to the person who organizes the event.
@@ -52,4 +54,3 @@ your calendar will be updated with the RSVP status from the person who responded
 
 When you now look at the event details in the calendar view, the status icons next
 to each participant now displays the new status.
-
diff --git a/plugins/calendar/helpdocs/en_US/manage.rst b/plugins/calendar/helpdocs/en_US/manage.rst
index 36292a55..b9c117b4 100644
--- a/plugins/calendar/helpdocs/en_US/manage.rst
+++ b/plugins/calendar/helpdocs/en_US/manage.rst
@@ -9,7 +9,7 @@ All functions to maintain your events are accessible from the main calendar view
 Add Events to a Calendar
 ------------------------
 
-**Via toolbar** 
+**Via toolbar**
     Click the *New event* button in the toolbar to get an empty dialog where you enter
     the :ref:`event properties <calendar-edit-event>` such as summary, date/time, reminders, etc.
     Click *Save* to finally add it to the selected calendar.
@@ -50,7 +50,7 @@ Here's a description of all the possible values:
 * ``Start``: Date and time when the event starts.
 * ``End``: Date and time when the event starts.
 * ``all-day``: Check this if the event has no start/end time.
-* ``Reminder``: Will pop up with an notification at a the specified time before the event.
+* ``Reminder``: Will pop up with a notification at a the specified time before the event. It is possible to select 'Message' (default) or 'Sound'. When Sound is selected, a sound will be played at the selected time. This setting requires the host to be able to play sounds.
 * ``Calendar``: The calendar the event is saved in. Change it to move an event from one calendar to another.
 * ``Category``: The type of event. Categories can also be used for :ref:`coloring <settings-calendar>`.
 * ``Show me as``: The representation in your free/busy scheduling calendar visible to others.
@@ -73,6 +73,13 @@ An important part of managing your schedule is to invite others to events and tr
 In this part of the edit dialog you can manage the participants of an event. Read more about this
 further down in the :ref:`calendar-event-participants` section.
 
+**Resources**
+
+As with participants, it is possible to manage the provided resources needed for the planned event. The tab is showing a list of the resources reserved for the current event.
+
+* ``Book Resource``: If the name of the resource is known, it can be typed into the textfield, and will be booked when the Book Resource button is pushed.
+* ``Find Resource``: If the name of the resource is not known, the Find Resource button is an option. It will open a new popup window showing a list of available resources, The FreeBusy information for these, and the Book Resource button.
+
 **Attachments**
 
 Sometimes a description text isn't enough to collect information for a specific event.
@@ -146,24 +153,22 @@ When creating a new event, switch to the *Participants* tab. You're already list
 
 Invitations will be sent out when you click *Save* and the event is created.
 
-.. only:: kolab
+.. index:: Availability
+.. _calendar-availability-finder:
 
-    .. index:: Availability
-    .. _calendar-availability-finder:
+Find Availability
+^^^^^^^^^^^^^^^^^
 
-    Find Availability
-    ^^^^^^^^^^^^^^^^^
+Once all the participants are added to the list, you see the individual availability status for each one
+of them, given that this information is available. In case not everybody is free, click the *Find availability...*
+button to open the scheduling dialog. In that dialog, detailed availability information for all participants is
+displayed. Use the *Previous/Next Slot* buttons to find the next time slot where all required participants are
+available. Or drag the gray area representing the event duration with the mouse to manually select a free slot.
 
-    Once all the participants are added to the list, you see the individual availability status for each one
-    of them, given that this information is available. In case not everybody is free, click the *Find availability...*
-    button to open the scheduling dialog. In that dialog, detailed availability information for all participants is
-    displayed. Use the *Previous/Next Slot* buttons to find the next time slot where all required participants are
-    available. Or drag the gray area representing the event duration with the mouse to manually select a free slot.
-
-    Click *Select* to copy the rescheduled date/time back into the event form and to close this dialog.
+Click *Select* to copy the rescheduled date/time back into the event form and to close this dialog.
 
 
 Receive Event Invitations
 -------------------------
 
-How to process incoming event invitations is described in chapter :ref:`calendar-invitations`.
\ No newline at end of file
+How to process incoming event invitations is described in chapter :ref:`calendar-invitations`.
diff --git a/plugins/calendar/helpdocs/en_US/overview.rst b/plugins/calendar/helpdocs/en_US/overview.rst
index b3833192..c7355945 100644
--- a/plugins/calendar/helpdocs/en_US/overview.rst
+++ b/plugins/calendar/helpdocs/en_US/overview.rst
@@ -92,11 +92,9 @@ Calendars List
 Events can be organized in different calendars which are all displayed in the lower left list.
 Use the checkboxes in that list to show or hide events from the specific calendars in the main view.
 
-.. only:: kolab
-
-    Beside your personal calendars, the list also displays calendars shared by other users
-    or ones that are shared amongst your workgroup. Small icons in the list give a hint
-    about the origin and some of them are possibly read-only which is denoted with a small lock icon.
+Beside your personal calendars, the list also displays calendars shared by other users
+or ones that are shared amongst your workgroup. Small icons in the list give a hint
+about the origin and some of them are possibly read-only which is denoted with a small lock icon.
 
 
 Colorized Events
@@ -135,4 +133,11 @@ Remove entire Calendars
 2. Click the gear icon in the calendars list footer and select *Remove* from the options menu.
 3. After a confirmation dialog, the selected calendar with all its events will be deleted.
    Caution: This action cannot be undone!
- 
\ No newline at end of file
+
+Special Calendars
+-----------------
+
+A number of special calendars are prepared a default:
+* ``Birthdays``: This calendar is listing birthdays of contacts as selected in the :ref:`settings-calendar`.
+* ``Pending Invitations``: All pending invitations are listed in this calendar.
+* ``Declined Invitations``: When invitations are declined, the events are listed in this calendar.
diff --git a/plugins/calendar/helpdocs/en_US/printing.rst b/plugins/calendar/helpdocs/en_US/printing.rst
new file mode 100644
index 00000000..d8ec9be2
--- /dev/null
+++ b/plugins/calendar/helpdocs/en_US/printing.rst
@@ -0,0 +1,24 @@
+.. index:: Print
+.. _calendar-print:
+
+*************
+Printing
+*************
+
+The calendar(s) currently shown in the main view can be printed to the default printer:
+
+1. Select the desired calendar view.
+2. Push the *Printer* icon in the toolbar.
+3. A new print preview page will open.
+4. Push the *Print* button in the top left corner of the print preview page.
+
+.. figure:: _static/_skin/calendar-toolbar.png
+    :align: center
+
+    Calendar toolbar
+
+.. figure:: _static/_skin/calendar-print.png
+    :scale: 75 %
+    :align: center
+
+    Print view page
diff --git a/plugins/calendar/helpdocs/en_US/settings.rst b/plugins/calendar/helpdocs/en_US/settings.rst
index 154e6e81..1e6e5349 100644
--- a/plugins/calendar/helpdocs/en_US/settings.rst
+++ b/plugins/calendar/helpdocs/en_US/settings.rst
@@ -24,11 +24,9 @@ Main Options
     When opening the day or week view, the listing of events starts at this time. Of course all
     hours of a day are visible by scrolling further up.
 
-.. only:: kolab
-
-    **Working hours**
-        This time range will be used in the :ref:`availability finder <calendar-availability-finder>`
-        when automatically selecting free slots for a meeting.
+**Working hours**
+    This time range will be used in the :ref:`availability finder <calendar-availability-finder>`
+    when automatically selecting free slots for a meeting.
 
 **Event coloring**
     The coloring of the title of an event block ("outline") as well as the background color of the box ("content")
diff --git a/plugins/calendar/helpdocs/en_US/sharing.rst b/plugins/calendar/helpdocs/en_US/sharing.rst
index 34599dfe..52f1e917 100644
--- a/plugins/calendar/helpdocs/en_US/sharing.rst
+++ b/plugins/calendar/helpdocs/en_US/sharing.rst
@@ -1,49 +1,46 @@
+.. index:: Sharing
 .. _calendar-sharing:
 
-.. only:: kolab
+Sharing Calendars
+=================
 
-    .. index:: Sharing
-
-    Sharing Calendars
-    =================
-
-    For collaboration, sharing calendars is an important feature. In the :ref:`overview <calendar-lists>`,
-    we have already learned how calendars others share with you appear in the calendars list. The following
-    now explains how to make personal calendars accessible to fellow users.
+For collaboration, sharing calendars is an important feature. In the :ref:`overview <calendar-lists>`,
+we have already learned how calendars others share with you appear in the calendars list. The following
+now explains how to make personal calendars accessible to fellow users.
 
 
-    Share a Calendar with others
-    ----------------------------
+Share a Calendar with others
+----------------------------
 
-    Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-edit-properties>`.
-    Double-click a calendar in the list on the left and then select the *Sharing* tab at the top of
-    the dialog box:
+Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-edit-properties>`.
+Double-click a calendar in the list on the left and then select the *Sharing* tab at the top of
+the dialog box:
 
-    .. image:: _static/_skin/calendar-acl.png
+.. image:: _static/_skin/calendar-acl.png
 
-    The table displays who already has permission to see and modify the selected calendar.
-    In order to share the calendar with a new user do
+The table displays who already has permission to see and modify the selected calendar.
+In order to share the calendar with a new user do
 
-    1. Click the *Add entry* button (+) in the table footer
-    2. Enter the username or choose one from the autocompletion menu that appears when you start typing.
-       Instead of a specific user, permissons can be granted for all users or guests.
-    3. Select the access rights you want to grant for the user
-    4. Click *Save* to add the permission
+1. Click the *Add entry* button (+) in the table footer
+2. Enter the username or choose one from the autocompletion menu that appears when you start typing.
+   Instead of a specific user, permissons can be granted for all users or guests.
+3. Select the access rights you want to grant for the user
+4. Click *Save* to add the permission
 
-    Double-click an entry to edit the permissions for a particular user or group.
+Double-click an entry to edit the permissions for a particular user or group.
 
-    For removing existing permissions, select the according entry in the list and then choose
-    *Delete* from the menu behind the gear icon in the footer of the list.
+For removing existing permissions, select the according entry in the list and then choose
+*Delete* from the menu behind the gear icon in the footer of the list.
 
 
-    Subscribe to Shared Calendars
-    -----------------------------
+Subscribe to Shared Calendars
+-----------------------------
 
-    Calendars shared by others are not showing up right away in the list within the calendar view.
-    Switch to :ref:`Settings > Folders <settings-folders>` to see all resources you can access.
-    There's a shortcut to this: click *Manage folders* in the options menu behind the gear icon
-    located the footer of the calendars list.
+Calendars shared by others are not showing up right away in the list within the calendar view.
+Switch to :ref:`Settings > Folders <settings-folders>` to see all resources you can access.
+There's a shortcut to this: click *Manage folders* in the options menu behind the gear icon
+located the footer of the calendars list.
 
-    In order to make a shared calendar appear in the calendars list, locate it in the folder manager
-    and check the *Subscribed* mark in the list. Only subscribed calendars are visible in the calendar view.
+In order to make a shared calendar appear in the calendars list, locate it in the folder manager
+and check the *Subscribed* mark in the list. Only subscribed calendars are visible in the calendar view.
 
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..df13fd91
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/index.po
new file mode 100644
index 00000000..cc82c174
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..b7147dc6
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..7c8a9f87
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..e0938de2
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..c8badb23
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..ccc84c0c
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ar/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/importexport.po
index 726ddbeb..430e15c0 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/index.po
index 5b6acc8c..cd47c18c 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/invitations.po
index ab66c119..82d9c727 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po
index 517e15e6..2b38bd8d 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po
index ea5205e8..5da674b6 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/settings.po
index 380c1347..1afc2f09 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/sharing.po
index e884f795..345bc408 100644
--- a/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/bg_BG/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/importexport.po
index d3f5efec..a45e20d4 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/index.po
index 66c94d03..2dc2318e 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/invitations.po
index 572898cb..277f1c65 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po
index d542da84..a201e36d 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po
index 23fd8382..31ce97a6 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/settings.po
index c70eaf82..e52252ec 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/sharing.po
index 9abf7ef9..40efe7b7 100644
--- a/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/ca_ES/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/importexport.po
index 5ff7464f..0d924a76 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/importexport.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po
index 00733ad5..221a496b 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/invitations.po
index 96cef091..abffa26d 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/invitations.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po
index 594b3258..e6db97f0 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po
index d27fcf9f..32cf72ae 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/settings.po
index a07945e3..801c2775 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/sharing.po
index 47810cd7..89aaac54 100644
--- a/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/cs_CZ/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/importexport.po
index db148249..6fb38169 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/index.po
index 234f3c73..b551bad9 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/invitations.po
index b1df4906..f222da29 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/manage.po
index e25a6e33..ba5f1f87 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/overview.po
index dcc4fe84..8dc54729 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/settings.po
index a20359ff..b49a5390 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/sharing.po
index e871796c..048b43a9 100644
--- a/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/da_DK/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/importexport.po
index d3c56f8a..849cc7e8 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/index.po
index e4c169bd..e2879386 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/invitations.po
index c118c86e..8a13b0b2 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/manage.po
index 8691b865..967c58b8 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/overview.po
index da387328..48db75c1 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/settings.po
index b3ba9cc4..c2e499a2 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/sharing.po
index c56232f3..2e803f29 100644
--- a/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/de_CH/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po
index 9db96623..0a6b450c 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Gerd Seyfarth <mail@netsecond.net>, 2015
+# Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:47+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +22,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
-msgstr "Import/Export"
+msgstr "Importieren/Exportieren"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:11
 msgid ""
@@ -42,7 +44,7 @@ msgstr "Klicken Sie in der Kalenderansicht auf die Werkzeugleistenschaltfläche
 
 #: ../../en_US/_plugins/calendar/importexport.rst:21
 msgid "Then select the file to import from your computer's hard drive."
-msgstr ""
+msgstr "Dann die Datei für den Import von Ihrer Festplatte wählen."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:22
 msgid "Select the calendar to import the events to."
@@ -78,7 +80,7 @@ msgstr "Klicken Sie in der Kalenderansicht auf die Werkzeugleistenschaltfläche
 
 #: ../../en_US/_plugins/calendar/importexport.rst:39
 msgid "Select the calendar where events should be exported from."
-msgstr ""
+msgstr "Kalender wählen dessen Termine exportiert werden sollen."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:40
 msgid ""
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po
index 800333a4..4462b632 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:47+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po
index ce825a13..2bc6d6ef 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:16+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po
index 3e6abcca..ffdec701 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:17+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po
index 2d8c8e20..5e6f0dc6 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:17+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po
index 9ceab84e..298df039 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:17+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po
index 721eb4c4..43ac9df3 100644
--- a/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Mads <mads@batmads.com>, 2016
+# Max Hellwig <max.hellwig@translating-energy.de>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:17+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Max Hellwig <max.hellwig@translating-energy.de>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +22,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
-msgstr "Geteilte Kalender"
+msgstr "Kalender teilen"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:13
 msgid ""
@@ -28,56 +30,56 @@ msgid ""
 ":ref:`overview <calendar-lists>`, we have already learned how calendars "
 "others share with you appear in the calendars list. The following now "
 "explains how to make personal calendars accessible to fellow users."
-msgstr ""
+msgstr "Kalender zu teilen ist ein wichtiger Teil der Zusammenarbeit. In der :ref:`Übersicht <calendar-lists>` haben wir schon gelernt, wie Kalender, die von anderen mit Ihnen teilen, in der Kalenderliste aussehen. Im Folgenden wird jetzt erklärt wie man persönliche Kalender für andere Benutzer zugänglich macht."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:19
 msgid "Share a Calendar with others"
-msgstr "Kalender mit Anderen teilen"
+msgstr "Einen Kalender mit Anderen teilen"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:21
 msgid ""
 "Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
 "edit-properties>`. Double-click a calendar in the list on the left and then "
 "select the *Sharing* tab at the top of the dialog box:"
-msgstr ""
+msgstr "Das Teilen wird über den :ref:`Kalendereinstellungen-Dialog <calendar-edit-properties>` gesteuert. Doppelklicken Sie einen Kalenders in der Liste links und wählen dann den *Teilen*-Reiter im oberen Teil des Dialogfensters aus:"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:27
 msgid ""
 "The table displays who already has permission to see and modify the selected"
 " calendar. In order to share the calendar with a new user do"
-msgstr ""
+msgstr "Die Tabelle zeigt an, wer schon Erlaubnis hat, den ausgewählten Kalender zu sehen und verändern. Um den Kalender mit einem neuen Benutzer zu teilen,"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:30
 msgid "Click the *Add entry* button (+) in the table footer"
-msgstr "Klicken Sie auf die Schaltfläche *Eintrag hinzufügen* (+) im Tabellenfuß"
+msgstr "klicken Sie auf die *Eintrag hinzufügen*-Schaltfläche (+) in der Fußzeile der Tabelle."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:31
 msgid ""
 "Enter the username or choose one from the autocompletion menu that appears "
 "when you start typing. Instead of a specific user, permissons can be granted"
 " for all users or guests."
-msgstr ""
+msgstr "Geben Sie den Benutzername ein oder wählen Sie einen aus dem Autovervollständigungs-Menü aus, das erscheint, wenn Sie zu tippen beginnen. Statt einem bestimmten Benutzer können Erlaubnisse auch allen Benutzern oder Gästen gewährt werden."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:33
 msgid "Select the access rights you want to grant for the user"
-msgstr ""
+msgstr "Wählen Sie die Zugangsberechtigungen, die Sie dem Benutzer gewähren wollen."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:34
 msgid "Click *Save* to add the permission"
-msgstr "Klicken Sie auf *Speichern* zum Hinzufügen der Berechtigung."
+msgstr "Klicken Sie auf *Speichern*, um die Erlaubnis hinzuzufügen."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:36
 msgid ""
 "Double-click an entry to edit the permissions for a particular user or "
 "group."
-msgstr ""
+msgstr "Doppelklicken Sie einen Eintrag, um Erlaubnisse für einen bestimmten Benutzer oder eine bestimmte Gruppe zu bearbeiten."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:38
 msgid ""
 "For removing existing permissions, select the according entry in the list "
 "and then choose *Delete* from the menu behind the gear icon in the footer of"
 " the list."
-msgstr ""
+msgstr "Um bestehende Freigaben zu entfernen, wählen Sie den entsprechenden Eintrag in der Liste aus und wählen dann *Löschen* aus dem Menü hinter dem Zahnradicon in der Fußzeile der Liste aus."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:43
 msgid "Subscribe to Shared Calendars"
@@ -90,11 +92,11 @@ msgid ""
 " see all resources you can access. There's a shortcut to this: click *Manage"
 " folders* in the options menu behind the gear icon located the footer of the"
 " calendars list."
-msgstr ""
+msgstr "Von anderen geteilte Kalender tauchen nicht sofort in der Liste innerhalb der Kalenderansicht auf. Wechseln Sie zu :ref:`Einstellungen > Ordner <settings-folders>`, um alle Hilfsmittel zu sehen, auf die Sie zugreifen können. Es gibt auch einen kürzeren Weg dorthin: Klicken Sie auf *Ordner verwalten* im Optionsmenü hinter dem Zahnradicon in der Fußzeile der Kalenderliste."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:50
 msgid ""
 "In order to make a shared calendar appear in the calendars list, locate it "
 "in the folder manager and check the *Subscribed* mark in the list. Only "
 "subscribed calendars are visible in the calendar view."
-msgstr ""
+msgstr "Um einen geteilten Kalender in der Kalenderliste erscheinen zu lassen, suchen Sie ihn in der Ordnerverwaltung und versehen Sie das *Abonniert*-Kästchen in der Liste mit einem Häkchen. Nur abonnierte Kalender sind in der Kalenderansicht sichtbar."
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..38cb52e7
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/index.po
new file mode 100644
index 00000000..dbb1eff9
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/index.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2017-09-23 01:21+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr "Ημερολόγιο"
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..09f8441d
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..19ce4a3a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..07427a9a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..62023b5f
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..a971067e
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/el/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..77f89b5b
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/index.po
new file mode 100644
index 00000000..6eee600e
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..1d30bb2f
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..eaba5ca7
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..0858f4f1
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..cdcb4895
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..26eb14d6
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/en_RO/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/importexport.po
index d01852bc..340d10d4 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/importexport.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/index.po
index c74939be..299e38ff 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/index.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/invitations.po
index e5f10a9f..e1e6f678 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/invitations.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/manage.po
index 7452685b..05fbbb57 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/manage.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/overview.po
index ae4b735c..e3d813a4 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/overview.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/settings.po
index 6d77d60a..31456684 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/settings.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/sharing.po
index fcf11b6b..9b71f4c6 100644
--- a/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/sharing.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/importexport.po
index dfe07dc4..1e0183c4 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po
index 35d8ac74..076c7ee8 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# alfvicente <alfvicente@yahoo.com.ar>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: alfvicente <alfvicente@yahoo.com.ar>\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
-msgstr ""
+msgstr "Calendario"
 
 #: ../../en_US/_plugins/calendar/index.rst:11
 msgid ""
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/invitations.po
index 3fd29cbf..397e84dd 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/manage.po
index edc7baa1..f6d541d4 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/overview.po
index 445f3be5..d5a2b049 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/settings.po
index 13d7e3a0..27f10f28 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/sharing.po
index abdd70bb..befccf0b 100644
--- a/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/importexport.po
index 0395809d..08c5dea6 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/importexport.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,13 +20,13 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
-msgstr ""
+msgstr "Importar/Exportar"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:11
 msgid ""
 "Event data is usually exchanged using the standard |iCal|_ format which is "
 "supported for import and export."
-msgstr ""
+msgstr "Los datos de eventos se intercambian usualmente utilizando el formato estándar |iCal| _ que es compatible con la importación y la exportación."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:16
 msgid "Importing Events"
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/index.po
index 7b98eabc..4cbb4400 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/index.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,10 +20,10 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
-msgstr ""
+msgstr "Calendario"
 
 #: ../../en_US/_plugins/calendar/index.rst:11
 msgid ""
 "The *Calendar* gives you access to your personal and shared calendar and "
 "scheduling functions."
-msgstr ""
+msgstr "El *Calendario* le da acceso a su calendario personal y compartir las funciones de programación y calendario."
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/invitations.po
index bdd005c6..16074503 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/invitations.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
-msgstr ""
+msgstr "Gestionar las invitaciones para el evento"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:10
 msgid ""
@@ -27,7 +28,7 @@ msgid ""
 "other people to an event. This will send out invitation emails to all the "
 "participants with the event data attached. That allows one to directly "
 "accept or decline an event invitation."
-msgstr ""
+msgstr "En el capítulo :ref: `calendar-event-participants` hemos aprendido a invitar a otras personas a un evento. Enviará correos electrónicos con una invitación a todos los participantes con los datos del evento adjuntos. Esto permitirá aceptar directamente o rechazar una invitación de evento."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:17
 msgid "Receive Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/manage.po
index c3755a7c..b73ff388 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/manage.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,13 +20,13 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
-msgstr ""
+msgstr "Administrar su programa"
 
 #: ../../en_US/_plugins/calendar/manage.rst:9
 msgid ""
 "All functions to maintain your events are accessible from the main calendar "
 "view."
-msgstr ""
+msgstr "Se puede acceder a todas las funciones para mantener sus eventos desde la vista del calendario principal."
 
 #: ../../en_US/_plugins/calendar/manage.rst:13
 msgid "Add Events to a Calendar"
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/overview.po
index 18210866..f5ebc1a7 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/overview.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
-msgstr ""
+msgstr "Información general"
 
 #: ../../en_US/_plugins/calendar/overview.rst:8
 msgid ""
@@ -27,7 +28,7 @@ msgid ""
 ":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
 "<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
 "toolbar and search box."
-msgstr ""
+msgstr "La misma pantalla del módulo de calendario presenta las siguientes partes: el :ref: `Calendar View <calendar-view>`, una pequeña :ref: `Calendario: <calendar-minicalendar>` :ref: `calendar-lists` as Así como la barra de herramientas usual y cuadro de búsqueda."
 
 #: ../../en_US/_plugins/calendar/overview.rst:17
 msgid "Calendar View"
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/settings.po
index 9a37c8b1..d0166cf3 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,13 +20,13 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
-msgstr ""
+msgstr "Preferencias del calendario"
 
 #: ../../en_US/_plugins/calendar/settings.rst:10
 msgid ""
 "The settings for the calendar module are listed in *Settings > Preferences* "
 "and are grouped by the following sections:"
-msgstr ""
+msgstr "Los ajustes del módulo de calendario se enumeran en *Ajustes> Preferencias* y se agrupan en las siguientes secciones:"
 
 #: ../../en_US/_plugins/calendar/settings.rst:14
 msgid "Main Options"
@@ -122,7 +123,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/settings.rst:54
 msgid "Categories"
-msgstr ""
+msgstr "Categorías"
 
 #: ../../en_US/_plugins/calendar/settings.rst:56
 msgid ""
diff --git a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/sharing.po
index afdaa420..cd9fdfb7 100644
--- a/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
-msgstr ""
+msgstr "Compartir calendarios"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:13
 msgid ""
@@ -27,7 +28,7 @@ msgid ""
 ":ref:`overview <calendar-lists>`, we have already learned how calendars "
 "others share with you appear in the calendars list. The following now "
 "explains how to make personal calendars accessible to fellow users."
-msgstr ""
+msgstr "Para colaborar, compartir calendarios es una característica importante. En :ref: `overview <calendar-lists>`, ya hemos aprendido cómo aparecen en la lista de calendarios los calendarios que otros comparten con usted. A continuación se explica cómo hacer que otros usuarios puedan acceder a los calendarios personales."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:19
 msgid "Share a Calendar with others"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/importexport.po
index d9f32ffb..5cdcefe1 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/index.po
index f71c9000..4f721ab9 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/invitations.po
index 5c4bc991..fda7e50a 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/manage.po
index f241495f..9734b1e0 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/overview.po
index a98d3617..c7021667 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/settings.po
index ec08cf7f..3c571ae8 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/sharing.po
index be5931d3..a2b4964e 100644
--- a/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/et_EE/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/importexport.po
index 7888d501..7ddf5049 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/index.po
index 6c7d920f..f1ca46e8 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/invitations.po
index 522d2623..ec9bbdd2 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po
index ad17ea11..b2d06a9f 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po
index d8a89a90..e5731e58 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/settings.po
index 880c144b..d53f4673 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/sharing.po
index 7018e771..954599ca 100644
--- a/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/fi_FI/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..4e0fa037
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/index.po
new file mode 100644
index 00000000..3d8c1f8a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..1f40bc38
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..e173f470
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..725405e8
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..dfc540dd
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..3b9f0774
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/fr_CH/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/importexport.po
index 1dfa2010..480e3aea 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/index.po
index 0104b6f1..991860f5 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/index.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:47+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/invitations.po
index 13419d28..340b6c33 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po
index ef587a94..5ed851a2 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po
index b1b789b6..bb2a430d 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/settings.po
index ce298c43..1913344c 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/settings.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:17+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/sharing.po
index 518ade47..44cc151c 100644
--- a/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/importexport.po
index 979de8a1..08aadbfc 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/importexport.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/index.po
index 227e78bf..a8c2fa01 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/invitations.po
index 6608afb8..e25c31f8 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/invitations.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/manage.po
index c2da9826..487c55ae 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/overview.po
index 7b08c745..214af6c9 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/settings.po
index 40977d05..a3609749 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/sharing.po
index 78e77e31..6ff1431f 100644
--- a/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/he/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/importexport.po
index cfb6e0a9..778dfe5c 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/index.po
index 8647e578..0288d5d9 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/invitations.po
index dae9d0fa..9a7034e0 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/manage.po
index 59f431a8..1d0c8107 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/overview.po
index 07a0f9bf..2f79253c 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/settings.po
index d3a9cfac..57af906d 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/sharing.po
index 70459832..9bf774ce 100644
--- a/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/hr/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/importexport.po
index b1a90fac..e7e61bc5 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/index.po
index 8ed94639..76b2ff19 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/invitations.po
index bf23058b..59abf3c4 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po
index 0cf720dd..b7782b55 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po
index 170553de..7f828f10 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/settings.po
index 34903493..18d2cf53 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/sharing.po
index 12961eef..15d443e7 100644
--- a/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/hu_HU/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/importexport.po
index abcab501..4bf9df96 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/index.po
index 5fcc4110..2954ab20 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/invitations.po
index 4425d117..4f4c2c0b 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/manage.po
index 15e3a4c2..33f4b554 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/overview.po
index 8d2d120c..4646a9f7 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/settings.po
index 96d784ac..fe37bd4b 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/sharing.po
index 2475699f..f913e224 100644
--- a/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/it_IT/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/importexport.po
index 75070edb..eade496d 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/index.po
index f14d8610..98f7ae65 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/invitations.po
index 4f36144a..204560de 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po
index e308c87a..88fac50b 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po
index 4c310084..0da10745 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/settings.po
index 5bc337ac..ef1c25ab 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/sharing.po
index 763aecae..884ace37 100644
--- a/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/ja_JP/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..9f95d47a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/index.po
new file mode 100644
index 00000000..d9c4fa86
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..2bb75159
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..37119415
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..a4bedafc
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..c509a8be
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..27f21917
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..11b22ffd
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/index.po
new file mode 100644
index 00000000..04fbe9bc
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..d609aefb
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..5ca63f6e
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..826cb5c8
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..bbbb2e81
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..a7736ee4
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/ko_KR/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/importexport.po
index 7115cca2..e3ce0503 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po
index a82de842..fd9f11fd 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/invitations.po
index c0d1994f..1f48ddab 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po
index 3498b0a7..f2d5806a 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po
index 75ff081f..de917b46 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/settings.po
index 7d6784f7..fee2ac2b 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/sharing.po
index bc083537..b0b174b3 100644
--- a/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/ku_IQ/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..391ffdf5
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/index.po
new file mode 100644
index 00000000..ecc37d9a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..4344ff0b
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..c160163c
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..ab503954
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..32ce2c6f
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..166eacee
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/lv/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/importexport.po
index 686f8d86..c0a08060 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/index.po
index aa36909c..058565ce 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/invitations.po
index 8a77ff12..3098c44a 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po
index fd10d2db..f2998b92 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po
index 463ffc33..2a3eff6a 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/settings.po
index f3f5c099..38aa4f51 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/sharing.po
index f72af079..6908ec7f 100644
--- a/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/nl_NL/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/importexport.po
index 0ab70c9a..6dad617b 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/importexport.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/index.po
index f085bbba..f5c92fb6 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/invitations.po
index 2f81ca4c..74527065 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/invitations.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po
index bda6ae92..68fd8a48 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po
index 7e991a27..924633c7 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/settings.po
index 34341d42..25e737cf 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/sharing.po
index 0fce8048..f6391219 100644
--- a/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/importexport.po
index d61edf37..d10b856a 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/index.po
index 2a5b733b..b3e49948 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/invitations.po
index 7e5b7486..06f6b4de 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po
index dde4c33d..8722b98c 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po
index 65f63086..81fcfc22 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/settings.po
index 9d72b92d..cb679ea7 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/sharing.po
index b0c1bd1e..0d60d18f 100644
--- a/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/pt_BR/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..1a697599
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/index.po
new file mode 100644
index 00000000..13328733
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..ada15127
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..0dfe2eca
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..39ff75fa
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..9a72321f
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..fc6da054
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/pt_PT/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/importexport.po
index ac9bb6cf..07890c66 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/index.po
index a0901d13..171ae74d 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/invitations.po
index f37cec20..74f8b37f 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/manage.po
index 68a16876..cc33d2ba 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/overview.po
index 3a091223..32be6fee 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/settings.po
index 9c22a5da..b8131812 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/sharing.po
index 68e60226..0af7e6e2 100644
--- a/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/ro/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/importexport.po
index b4409dc0..45a6e3e8 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/importexport.po
@@ -3,94 +3,95 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Katherine Sidorova <ya-na-provode@yandex.ru>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Katherine Sidorova <ya-na-provode@yandex.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
-msgstr ""
+msgstr "Импорт/Экспорт"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:11
 msgid ""
 "Event data is usually exchanged using the standard |iCal|_ format which is "
 "supported for import and export."
-msgstr ""
+msgstr "Обмен данными о событиях происходит с использованием стандартного '|iCall'-формата, который поддерживается для импорта и экспорта"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:16
 msgid "Importing Events"
-msgstr ""
+msgstr "Импорт событий"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:18
 msgid "This is how to add events from an |iCal|_ (.ics) file:"
-msgstr ""
+msgstr "Как добавить события из '|iCal|' (.ics) файла:"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:20
 msgid "Click the *Import* toolbar button in the calendar view."
-msgstr ""
+msgstr "Кликните на кнопку 'импорт' на панели инструментов календарного вида."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:21
 msgid "Then select the file to import from your computer's hard drive."
-msgstr ""
+msgstr "Затем выберите файл для импорта с жесткого диска Вашего компьютера."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:22
 msgid "Select the calendar to import the events to."
-msgstr ""
+msgstr "Выберите календарь, в который хотите импортировать события."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:23
 msgid "Select the threshold for old events to be imported."
-msgstr ""
+msgstr "Выберите порог для импортирования старых событий."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:24
 msgid "Click *Import* and wait for the upload to finish."
-msgstr ""
+msgstr "Выберите 'импорт' и дождитесь окончания загрузки."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:26
 msgid ""
 "The calendar view will be refreshed to display the newly imported events. "
 "Verify that the according calendar is active if you don't see them."
-msgstr ""
+msgstr "Календарь будет обновляться, чтобы отобразить импортированные события. Удостоверьтесь, что календарь активен, если Вы не видите их."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:34
 msgid "Exporting Events"
-msgstr ""
+msgstr "Экспорт событий"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:36
 msgid ""
 "Events from your calendars can be exported and downloaded in the |iCal|_ "
 "format."
-msgstr ""
+msgstr "События из Вашего календаря могут быть экспортированны и загружены в формате  '|iCal|'."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:38
 msgid "Click the *Export* toolbar button in the calendar view."
-msgstr ""
+msgstr "Кликните на кнопку 'экспорт' на панели инструментов календарного вида."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:39
 msgid "Select the calendar where events should be exported from."
-msgstr ""
+msgstr "Выберите календарь из которого нужно экспортировать события."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:40
 msgid ""
 "With the *Events from* selector you choose the time constraints for "
 "exporting."
-msgstr ""
+msgstr "При помощи функции 'события от' выберите для импорта ограничения по времени ."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:41
 msgid "Click the *Export* button to start the export."
-msgstr ""
+msgstr "Нажмите кнопку 'экспорт' для начала экспортирования."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:42
 msgid ""
 "Choose where to save the exported .ics file if prompted, otherwise check the"
 " \"Downloads\" folder on your computer."
-msgstr ""
+msgstr "При возникновении запроса выберите, где будет сохранен экспортируемый .ics файл. Иначе проверьте папку \"загрузки\" на Вашем компьютере."
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/index.po
index d1c01c9e..14f6d2f2 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/index.po
@@ -3,26 +3,27 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Katherine Sidorova <ya-na-provode@yandex.ru>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Katherine Sidorova <ya-na-provode@yandex.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
-msgstr ""
+msgstr "Календарь"
 
 #: ../../en_US/_plugins/calendar/index.rst:11
 msgid ""
 "The *Calendar* gives you access to your personal and shared calendar and "
 "scheduling functions."
-msgstr ""
+msgstr "*Календарь* дает Вам доступ к персональному и общему календарям, а так же предоставляет возможность планирования."
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/invitations.po
index c3542732..888008d8 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/invitations.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Katherine Sidorova <ya-na-provode@yandex.ru>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Katherine Sidorova <ya-na-provode@yandex.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
-msgstr ""
+msgstr "Управление приглашениями на мероприятия"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:10
 msgid ""
@@ -27,21 +28,21 @@ msgid ""
 "other people to an event. This will send out invitation emails to all the "
 "participants with the event data attached. That allows one to directly "
 "accept or decline an event invitation."
-msgstr ""
+msgstr "В разделе :ref:` календарь-мероприятия-участники' мы узнали, как приглашать других людей. Приглашенным будут разосланы письма с прикрепленной дато события. Это позволяет принимать или отклонять приглашение на мероприятие."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:17
 msgid "Receive Event Invitations"
-msgstr ""
+msgstr "Получение приглашений на мероприятия"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:19
 msgid ""
 "When the webmail system opens an invitation email with event data attached, "
 "it'll display a yellow box in the preview pane or the email view:"
-msgstr ""
+msgstr "Когда электронная почтовая система открывает приглашение на мероприятие с приложенной датой, она показывает желтый квадрат на панели предварительного просмотра или письмо вида:"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:25
 msgid "Accept/Decline Invitations"
-msgstr ""
+msgstr "Принять/отклонить приглашения"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:27
 msgid ""
@@ -49,14 +50,14 @@ msgid ""
 "clicking the according button. This will send an automated response to the "
 "event organizer informing her about your decision and letting her update "
 "your participant status in her calendar."
-msgstr ""
+msgstr "Справа в окне, показанном выше, Вы можете принять или отклонить приглашение, нажав на соответствующую кнопку. Это позволит отправлять автоматический ответ организатору мероприятия, информируя его о своем решении и позволяя обновить Ваш статус участника в его календаре."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:31
 msgid ""
 "In case you accept, by either clicking *Accept* or *Maybe*, this will also "
 "copy the event into your personal calendar. The selector right next to the "
 "buttons lets you choose the right one."
-msgstr ""
+msgstr "Если Вы соглашаетесь, выбирая *Принять* или *Возможно*, событие будет скопировано в Ваш персональный календарь. Селектор справа рядом с кнопками позволяет выбрать правильное событие."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:35
 msgid ""
@@ -64,40 +65,40 @@ msgid ""
 "sender. If you now delete it from your calendar, you'll be asked whether "
 "this should send a declination message to the person who organizes the "
 "event."
-msgstr ""
+msgstr "Копия в Вашем календаре 'знает' о событии и его отправителе. Если Вы теперь удалите из своего календаря, Вас спросят, нужно ли отправлять письмо с отказом человеку, организовавшему мероприятие."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:39
 msgid ""
 "After acceping or declining, the email message containing the invitation can"
 " be deleted."
-msgstr ""
+msgstr "Посте принятия или отклонения, сообщение с приглашением может быть удалено."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:43
 msgid "Process Invitation Replies"
-msgstr ""
+msgstr "Процесс ответа на приглашения"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:45
 msgid ""
 "As an organizer who has invited others to an event, you'll receive responses"
 " to the automatically sent invitations when the attendees either accept or "
 "decline them."
-msgstr ""
+msgstr "Как организатор, который пригласил других людей на мероприятие, Вы автоматически получите ответы на приглашения, когда участники примут или отклонят их."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:48
 msgid ""
 "Such messages are also identified by the webmail system and again a yellow "
 "box appears in the message view:"
-msgstr ""
+msgstr "Подобные сообщения так же идентифицируются почтовой системой, и снова желтый квадрат появляется при просмотре сообщений:"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:53
 msgid ""
 "By clicking the *Update the participant's status* button, the original event"
 " in your calendar will be updated with the RSVP status from the person who "
 "responded here."
-msgstr ""
+msgstr "Если нажать кнопку *Обновить статус участников*, событие в Вашем календаре будет обновляться с RSVP статус человека, который ответил на приглашение."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:56
 msgid ""
 "When you now look at the event details in the calendar view, the status "
 "icons next to each participant now displays the new status."
-msgstr ""
+msgstr "Когда Вы посмотрите детали события в каленарном виде, иконки рядом с каждым участником будут отображать его новый статус."
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po
index af415a75..f6f10a45 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po
index 2aa699cb..84c27b77 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/settings.po
index c0712dca..2d62bfd6 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/sharing.po
index a3396c90..d2135a08 100644
--- a/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/importexport.po
index 3aa9d5c9..6af5e0ee 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/importexport.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/index.po
index e7f3cc0d..63253272 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/invitations.po
index 992456eb..135b346a 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/invitations.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/manage.po
index a4196e73..03dacd07 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/overview.po
index dc5a2192..c161e47e 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/settings.po
index 38ff4574..41816db1 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/sharing.po
index fcef687e..4e4a2366 100644
--- a/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/sk/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..0887e476
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/index.po
new file mode 100644
index 00000000..c5b894e4
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..5b060c82
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..8980eb61
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..b718cd05
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..c6edbfcd
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..89adecf8
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/sl_SI/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/importexport.po
index 29174513..992a89ba 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/importexport.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/index.po
index 2a097f10..81e98aac 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/index.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/invitations.po
index 8437ff45..a2ea611e 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/invitations.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/manage.po
index d12eda24..55be2368 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/manage.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/overview.po
index f9f28d9d..08770dfc 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/overview.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/settings.po
index 05c394f9..a47c741b 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/settings.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/sharing.po
index b8fdd00d..6fb7c064 100644
--- a/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/sv/LC_MESSAGES/sharing.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:07+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..25814356
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/index.po
new file mode 100644
index 00000000..f46b2f93
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..60baa113
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..ed9461c2
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..69acc79b
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..ac2af31a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..04cd275a
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/th_TH/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/importexport.po
new file mode 100644
index 00000000..fe81ae91
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/importexport.po
@@ -0,0 +1,96 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/importexport.rst:9
+msgid "Import/Export"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:11
+msgid ""
+"Event data is usually exchanged using the standard |iCal|_ format which is "
+"supported for import and export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:16
+msgid "Importing Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:18
+msgid "This is how to add events from an |iCal|_ (.ics) file:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:20
+msgid "Click the *Import* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:21
+msgid "Then select the file to import from your computer's hard drive."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:22
+msgid "Select the calendar to import the events to."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:23
+msgid "Select the threshold for old events to be imported."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:24
+msgid "Click *Import* and wait for the upload to finish."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:26
+msgid ""
+"The calendar view will be refreshed to display the newly imported events. "
+"Verify that the according calendar is active if you don't see them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:34
+msgid "Exporting Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:36
+msgid ""
+"Events from your calendars can be exported and downloaded in the |iCal|_ "
+"format."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:38
+msgid "Click the *Export* toolbar button in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:39
+msgid "Select the calendar where events should be exported from."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:40
+msgid ""
+"With the *Events from* selector you choose the time constraints for "
+"exporting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:41
+msgid "Click the *Export* button to start the export."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/importexport.rst:42
+msgid ""
+"Choose where to save the exported .ics file if prompted, otherwise check the"
+" \"Downloads\" folder on your computer."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/index.po
new file mode 100644
index 00000000..e48045c1
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/index.rst:9
+msgid "Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/index.rst:11
+msgid ""
+"The *Calendar* gives you access to your personal and shared calendar and "
+"scheduling functions."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/invitations.po
new file mode 100644
index 00000000..af3d9a3b
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/invitations.po
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/invitations.rst:8
+msgid "Handle Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:10
+msgid ""
+"In chapter :ref:`calendar-event-participants` we have learned how to invite "
+"other people to an event. This will send out invitation emails to all the "
+"participants with the event data attached. That allows one to directly "
+"accept or decline an event invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:17
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:19
+msgid ""
+"When the webmail system opens an invitation email with event data attached, "
+"it'll display a yellow box in the preview pane or the email view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:25
+msgid "Accept/Decline Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:27
+msgid ""
+"Right in the box shown above, you can accept or decline the invitation by "
+"clicking the according button. This will send an automated response to the "
+"event organizer informing her about your decision and letting her update "
+"your participant status in her calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:31
+msgid ""
+"In case you accept, by either clicking *Accept* or *Maybe*, this will also "
+"copy the event into your personal calendar. The selector right next to the "
+"buttons lets you choose the right one."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid ""
+"The copy in your calendar now knows about the invitation and its original "
+"sender. If you now delete it from your calendar, you'll be asked whether "
+"this should send a declination message to the person who organizes the "
+"event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:39
+msgid ""
+"After acceping or declining, the email message containing the invitation can"
+" be deleted."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:43
+msgid "Process Invitation Replies"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:45
+msgid ""
+"As an organizer who has invited others to an event, you'll receive responses"
+" to the automatically sent invitations when the attendees either accept or "
+"decline them."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:48
+msgid ""
+"Such messages are also identified by the webmail system and again a yellow "
+"box appears in the message view:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:53
+msgid ""
+"By clicking the *Update the participant's status* button, the original event"
+" in your calendar will be updated with the RSVP status from the person who "
+"responded here."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:56
+msgid ""
+"When you now look at the event details in the calendar view, the status "
+"icons next to each participant now displays the new status."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..ff44c27d
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/manage.po
@@ -0,0 +1,342 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/manage.rst:7
+msgid "Manage Your Schedule"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:9
+msgid ""
+"All functions to maintain your events are accessible from the main calendar "
+"view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:13
+msgid "Add Events to a Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:18
+msgid "**Via toolbar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:16
+msgid ""
+"Click the *New event* button in the toolbar to get an empty dialog where you"
+" enter the :ref:`event properties <calendar-edit-event>` such as summary, "
+"date/time, reminders, etc. Click *Save* to finally add it to the selected "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:27
+msgid "**At a specific date/time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:21
+msgid ""
+"Navigate the calendar view to the date you want to add an event for. Then "
+"mark the range of time (or dates in month view) with the mouse by pressing "
+"the button at the time the event should start and releasing it again at time"
+" it finishes. This will open the :ref:`event dialog <calendar-edit-event>` "
+"with the selected date/time range already filled in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:26
+msgid ""
+"In order to create new all-day events, double-click the desired day in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:33
+msgid "Edit and Reschedule Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:36
+msgid "The Event Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:38
+msgid ""
+"When clicking an event in the calendar view, a dialog showing its details is"
+" displayed. Clicking the *Edit* button in that dialog opens the form to edit"
+" all properties of the selected event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:41
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:44
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:46
+msgid ""
+"This general section has text fields and selectors for various properties of"
+" an event. Here's a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:49
+msgid ""
+"``Summary``: The title of the event. This is what you will see in the "
+"calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:50
+msgid "``Location``: Where the event will be taking place."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:51
+msgid "``Description``: Any text that describes the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:52
+msgid "``URL``: A link to more information about this event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:53
+msgid "``Start``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:54
+msgid "``End``: Date and time when the event starts."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:55
+msgid "``all-day``: Check this if the event has no start/end time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:56
+msgid ""
+"``Reminder``: Will pop up with an notification at a the specified time "
+"before the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:57
+msgid ""
+"``Calendar``: The calendar the event is saved in. Change it to move an event"
+" from one calendar to another."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:58
+msgid ""
+"``Category``: The type of event. Categories can also be used for "
+":ref:`coloring <settings-calendar>`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:59
+msgid ""
+"``Show me as``: The representation in your free/busy scheduling calendar "
+"visible to others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:60
+msgid "``Priority``: The priority value of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:61
+msgid ""
+"``Privacy``: Flag an event as \"private\" or \"confidential\" when sharing "
+"your calendar with others."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:63
+msgid "**Recurrence**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:65
+msgid ""
+"For periodically recurring event series, this tabs has the settings how an "
+"event is repeated over time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:68
+msgid "``Repeat``: Start with selecting a repetition interval (e.g. monthly)"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:69
+msgid ""
+"``Every``: How often the frequency will be relevant. For example, for an "
+"event that takes place every other week choose Weekly and then 2. If you "
+"choose a frequency of weekly or monthly you can select which days of the "
+"week or month the event will occur."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:71
+msgid ""
+"``Until``: Determines the duration of the repetition. The recurrence can "
+"either run forever, for a number it times or until a specific date."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:73
+msgid "**Participants**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:75
+msgid ""
+"An important part of managing your schedule is to invite others to events "
+"and track their RSVP. In this part of the edit dialog you can manage the "
+"participants of an event. Read more about this further down in the :ref"
+":`calendar-event-participants` section."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:79
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:81
+msgid ""
+"Sometimes a description text isn't enough to collect information for a "
+"specific event. Switch to this tab to attach files to the current event or "
+"to remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:86
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the event "
+"edit dialog. Even switching back and forth the tabs will not yet save the "
+"data."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:93
+msgid "Moving and Resizing with the Mouse"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:99
+msgid ""
+"If an existing event shall be rescheduled to another time or date, you'll "
+"find it handy to do that directly in the calendar view without opening the "
+"edit form. Simply grab the event block with the mouse and move it to the new"
+" date or time. Release the mouse button to complete."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:103
+msgid ""
+"In *Month* and *Day* view, the event blocks have a small handle at the "
+"bottom. Drag this with the mouse in order to resize the event meaning to "
+"adjust its duration."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:111
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:117
+msgid ""
+"While logged in to the webmail, event reminders will be displayed with pop-"
+"up boxes at the specified time before the event starts. You can specify if "
+"you want to see alarms for every calendar individually. Enable or disable "
+"reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the "
+":ref:`calendar-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:122
+msgid "Dismiss or Snooze Reminders"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:124
+msgid ""
+"When a reminder box pops up, you can either dismiss the notification for all"
+" events or each one individually. When dismissed, no further reminders will "
+"be displayed. Choose a time from the *Snooze* menu to get another reminder "
+"after the selected time."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:133
+msgid "Inviting Other People"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:135
+msgid ""
+"If you need to set up a meeting, and keep track of who's attending and who "
+"is not, the calendar can do this as well as you to automatically send "
+"invitations and read their responses."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:138
+msgid ""
+"When creating a new event, switch to the *Participants* tab. You're already "
+"listed as the organizer of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:142
+msgid ""
+"Enter the name or email address of the person to invite. Contacts from the "
+"address book are suggested as you type. In order to send invitations, make "
+"sure the entered contact has an email address. Type it in the form ``Person "
+"Name <email@address.com>``."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:145
+msgid "Click *Add participant* to add the person to the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:146
+msgid "Select a *Role* (e.g. required or optional) for this person."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:147
+msgid "Repeat 1-3 for further participants."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:148
+msgid ""
+"Check the *Send invitations* box if the application should send out "
+"invitation emails."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:150
+msgid ""
+"Invitations will be sent out when you click *Save* and the event is created."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:158
+msgid "Find Availability"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:160
+msgid ""
+"Once all the participants are added to the list, you see the individual "
+"availability status for each one of them, given that this information is "
+"available. In case not everybody is free, click the *Find availability...* "
+"button to open the scheduling dialog. In that dialog, detailed availability "
+"information for all participants is displayed. Use the *Previous/Next Slot* "
+"buttons to find the next time slot where all required participants are "
+"available. Or drag the gray area representing the event duration with the "
+"mouse to manually select a free slot."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:166
+msgid ""
+"Click *Select* to copy the rescheduled date/time back into the event form "
+"and to close this dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:170
+msgid "Receive Event Invitations"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/manage.rst:172
+msgid ""
+"How to process incoming event invitations is described in chapter :ref"
+":`calendar-invitations`."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..1f69e70e
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/overview.po
@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:8
+msgid ""
+"The screen of the calendar module presents the following parts: the "
+":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
+"<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
+"toolbar and search box."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:17
+msgid "Calendar View"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:19
+msgid ""
+"The central part of the screen displays the schedule with events from the "
+"active calendars matching the current date range. The active date range is "
+"displayed above the calendar in the toolbar area and can be moved forward or"
+" backward in time using the arrow buttons right next to the title."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:27
+msgid "Change Views"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:29
+msgid ""
+"You can view your calendar events in Day, Week, Month or Agenda view. Toggle"
+" the view mode using the toolbar buttons above the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:34
+msgid "**Day**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:33
+msgid ""
+"All events of a single day appear at the time the begin and spawn a box "
+"until their end time. The time scale is displayed in the left side of the "
+"view. All-day events appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid "**Week**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:37
+msgid ""
+"Similar to the day view but lists all days of the week horizontally. All-day"
+" events again appear at the top."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:42
+msgid "**Month**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:40
+msgid ""
+"Shows all events of the selected month at a time. Each event only appears as"
+" a single line and if there are more events in a day than can be listed, a "
+"number at the bottom of the day field indicates that. Click that link to "
+"open a zoomed view of that single day."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:47
+msgid "**Agenda**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:45
+msgid ""
+"The agenda view shows a list of events for the selected range in a "
+"chronological order and divided by headers denoting either days, weeks or "
+"months. Both the number of the days considered for the listing as well as "
+"the mode how to divide list can be adjusted with the controls at the bottom "
+"of the agenda view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:51
+msgid ""
+"For all the views, the small calendar on the left highlights the currently "
+"listed days."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:54
+msgid "Go to a specific Date"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:56
+msgid ""
+"Use the mini calendar widget on the left to jump to a specific date. Simply "
+"click a date and the date range of the current view moves to include the "
+"selected day. The left/right arrows in the mini calendar's header quickly "
+"cycle through the months. Use the drop-down menus hidden under the month and"
+" year display in the widget header to directly jump to another month or "
+"year."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:60
+msgid ""
+"A shortcut to switch the calendar view back to today or the current week "
+"provides the *Today* button located in the toolbar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:64
+msgid "Show Event Details"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:66
+msgid ""
+"Click an event box in the calendar view to open a dialog displaying all "
+"details of the event."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:70
+msgid "Searching Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:72
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title, location, description or "
+"attendees. Enter the search term into the box and press <Enter> on your "
+"keyboard to start the search. The calendar view will switch to *Agenda* mode"
+" in order to display a list of matches. Of course you can switch the view "
+"again to display the search results differently."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:77
+msgid ""
+"Events are searched within a certain date reange only which is displayed "
+"above the calendar view. Use the mini calendar widget or the arrow toolbar "
+"buttons and the range selector below the agenda view to adjust the time "
+"frame to search in."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:81
+msgid ""
+"For searching as well as for normal views, only events from active calendars"
+" are displayed. Use the checkboxes in the :ref:`calendar-lists` to add or "
+"hide events from different calendars."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:84
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box. This will also switch the calendar view to whatever mode you"
+" had before the search."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:93
+msgid "Calendars List"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:95
+msgid ""
+"Events can be organized in different calendars which are all displayed in "
+"the lower left list. Use the checkboxes in that list to show or hide events "
+"from the specific calendars in the main view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:100
+msgid ""
+"Beside your personal calendars, the list also displays calendars shared by "
+"other users or ones that are shared amongst your workgroup. Small icons in "
+"the list give a hint about the origin and some of them are possibly read-"
+"only which is denoted with a small lock icon."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:106
+msgid "Colorized Events"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:108
+msgid ""
+"In order to better distinguish the events from various calendars in the "
+"calendar view, calendars have a color assigned which is used to colorize the"
+" events on the screen. Check the :ref:`settings-calendar` for more advanced "
+"options how to colorize events in the calendar view."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:112
+msgid ""
+"You can create any number of calendars to store all your events and name "
+"them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:116
+msgid "Create a New Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:118
+msgid "Click the + icon in the calendars list footer."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:119
+msgid "In the dialog, give the new calendar a unique name and assign a color."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:120
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:122
+msgid "The calendar view will reload and list the new calendar on the left."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:127
+msgid "Edit Calendar Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:129
+#: ../../en_US/_plugins/calendar/overview.rst:137
+msgid "Select the calendar to edit by clicking it in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:130
+msgid ""
+"Click the gear icon in the calendars list footer and select *Edit* from the "
+"options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:131
+msgid "Adjust name, color or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:132
+msgid "Click *Save* to finally update the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:135
+msgid "Remove entire Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:138
+msgid ""
+"Click the gear icon in the calendars list footer and select *Remove* from "
+"the options menu."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/overview.rst:139
+msgid ""
+"After a confirmation dialog, the selected calendar with all its events will "
+"be deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..2d498397
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/settings.po
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/settings.rst:8
+msgid "Calendar Preferences"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:10
+msgid ""
+"The settings for the calendar module are listed in *Settings > Preferences* "
+"and are grouped by the following sections:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:14
+msgid "Main Options"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid "**Default view**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:17
+msgid ""
+"Lets you select the :ref:`calendar-view` which is visible by default when "
+"opening the calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:21
+msgid "**Time slots per hour**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:20
+msgid ""
+"How one hour in day and week view is divided vertically. If for example set "
+"to 2, you will see events displayed in 30 minute blocks."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "**First weekday**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:24
+msgid "Which weekday to begin the week view with."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:28
+msgid "**First hour to show**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:27
+msgid ""
+"When opening the day or week view, the listing of events starts at this "
+"time. Of course all hours of a day are visible by scrolling further up."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid "**Working hours**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:33
+msgid ""
+"This time range will be used in the :ref:`availability finder <calendar-"
+"availability-finder>` when automatically selecting free slots for a meeting."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:40
+msgid "**Event coloring**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:37
+msgid ""
+"The coloring of the title of an event block (\"outline\") as well as the "
+"background color of the box (\"content\") in day and week views is "
+"influenced by the color of the calendar an event belongs to and/or the color"
+" of the category it is assigned to. This setting lets you control which "
+"source for coloring to use or if you even want a combined coloring that "
+"reflects both, the assignment of calendars and categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid "**Default reminder setting**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:43
+msgid ""
+"When creating new events, they'll have this type of reminder set by default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "**Default reminder time**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:46
+msgid "When enabling reminders in a new event, use this preset as default."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:51
+msgid "**Create new events in**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:49
+msgid ""
+"This is the default selection for saving new events. Used in both the "
+"calendar view and when accepting event invitations."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:54
+msgid "Categories"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:56
+msgid ""
+"This block allows the management of categories used in your calendar and "
+"assign colors to them. Use the color picker to change the color by clicking "
+"on the square color box in the categories list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:59
+msgid ""
+"To add a new category, enter its unique name into the text box below the "
+"listing and then click the *Add category** button to add it. Note that you "
+"still need to click the *Save* button at the bottom of the preferences panel"
+" in order to finally register the new categories."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:65
+msgid "Birthdays Calendar"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:67
+msgid ""
+"The calendar view and also display birthdays from contacts saved in your "
+"address book. This block controls how this is done."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "**Display birthdays calendar**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:71
+msgid "Enable the birthdays calendar feature with this checkbox."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid "**From these address books**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:74
+msgid ""
+"Choose from which address books you'd like to see birthdays in your "
+"calendar."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:80
+msgid "**Show reminders**"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/settings.rst:77
+msgid ""
+"This option controls whether and when to display reminder notifications for "
+"upcoming birthdays."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/sharing.po
new file mode 100644
index 00000000..e9e93056
--- /dev/null
+++ b/plugins/calendar/helpdocs/locale/tr/LC_MESSAGES/sharing.po
@@ -0,0 +1,99 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/calendar/sharing.rst:11
+msgid "Sharing Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:13
+msgid ""
+"For collaboration, sharing calendars is an important feature. In the "
+":ref:`overview <calendar-lists>`, we have already learned how calendars "
+"others share with you appear in the calendars list. The following now "
+"explains how to make personal calendars accessible to fellow users."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:19
+msgid "Share a Calendar with others"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:21
+msgid ""
+"Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
+"edit-properties>`. Double-click a calendar in the list on the left and then "
+"select the *Sharing* tab at the top of the dialog box:"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:27
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" calendar. In order to share the calendar with a new user do"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:30
+msgid "Click the *Add entry* button (+) in the table footer"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:31
+msgid ""
+"Enter the username or choose one from the autocompletion menu that appears "
+"when you start typing. Instead of a specific user, permissons can be granted"
+" for all users or guests."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:33
+msgid "Select the access rights you want to grant for the user"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:34
+msgid "Click *Save* to add the permission"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:36
+msgid ""
+"Double-click an entry to edit the permissions for a particular user or "
+"group."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:38
+msgid ""
+"For removing existing permissions, select the according entry in the list "
+"and then choose *Delete* from the menu behind the gear icon in the footer of"
+" the list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:43
+msgid "Subscribe to Shared Calendars"
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:45
+msgid ""
+"Calendars shared by others are not showing up right away in the list within "
+"the calendar view. Switch to :ref:`Settings > Folders <settings-folders>` to"
+" see all resources you can access. There's a shortcut to this: click *Manage"
+" folders* in the options menu behind the gear icon located the footer of the"
+" calendars list."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/sharing.rst:50
+msgid ""
+"In order to make a shared calendar appear in the calendars list, locate it "
+"in the folder manager and check the *Subscribed* mark in the list. Only "
+"subscribed calendars are visible in the calendar view."
+msgstr ""
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/importexport.po
index bd0696f3..58bda800 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/importexport.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/index.po
index b57872cb..ef876961 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/invitations.po
index e5de3327..faf85510 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/invitations.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po
index 8fc00222..5063c8fb 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po
index 95d168be..3e360e1a 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/settings.po
index f478718c..f2386b60 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/sharing.po
index d7836d49..a96bed3d 100644
--- a/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/importexport.po
index 33c74852..89f098de 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/importexport.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/index.po
index a6a1933c..e9fe0c36 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/index.rst:9
 msgid "Calendar"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/invitations.po
index 1597780b..7eb896cf 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/invitations.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/manage.po
index ca00e168..74c688bc 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/overview.po
index a8432bf2..4db6b478 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/settings.po
index 7e951dba..d0ab4cc7 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/settings.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
diff --git a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/sharing.po
index a72f1095..8119f141 100644
--- a/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/uk/LC_MESSAGES/sharing.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/importexport.po
index 725d2ee1..94f4e899 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/index.po
index b732529f..9861aed5 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/invitations.po
index b4548862..5338448b 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/manage.po
index 1f39e041..5eddf4c8 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/overview.po
index f50b5f35..46073247 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/settings.po
index 49374f5c..0d597f74 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/sharing.po
index dd7446b4..53c9361d 100644
--- a/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/vi/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/importexport.po
index 90241f77..57878fc3 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/index.po
index 0277b138..e9bd28d1 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/invitations.po
index 220abcca..e1311e60 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po
index f0e51c4d..272b54b0 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po
index ee11b3bb..39052d71 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/settings.po
index bfa59d42..09b54d98 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/sharing.po
index d457d42c..8ca8b9d0 100644
--- a/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/zh_CN/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/importexport.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/importexport.po
index fb4f6d8e..83272891 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/importexport.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/importexport.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/index.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/index.po
index e57a4bab..97336ca8 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/index.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/invitations.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/invitations.po
index c36cf8a5..fbf384f0 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/invitations.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/invitations.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po
index e489f341..5c27570d 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po
index fa0e4dfd..16425d1d 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/settings.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/settings.po
index 88a5073a..28ee22a2 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/settings.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/settings.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/sharing.po b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/sharing.po
index 4f3c8d7c..2a4753e6 100644
--- a/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/sharing.po
+++ b/plugins/calendar/helpdocs/locale/zh_TW/LC_MESSAGES/sharing.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/calendar/helpdocs/po/invitations.pot b/plugins/calendar/helpdocs/po/invitations.pot
index 272f9797..c80c120d 100644
--- a/plugins/calendar/helpdocs/po/invitations.pot
+++ b/plugins/calendar/helpdocs/po/invitations.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2014, roundcube.net
+# Copyright (C) 2015, roundcube.net
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Roundcube Webmail Help 1.0\n"
+"Project-Id-Version: Roundcube Webmail Help 1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"POT-Creation-Date: 2017-01-12 11:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,30 +45,34 @@ msgid "In case you accept, by either clicking *Accept* or *Maybe*, this will als
 msgstr ""
 
 #: ../../en_US/_plugins/calendar/invitations.rst:35
+msgid "It is sometimes useful (especially when declining or delegating an event) to respond without saving the event in your calendar. To do this use \"--\" entry in calendars selector."
+msgstr ""
+
+#: ../../en_US/_plugins/calendar/invitations.rst:37
 msgid "The copy in your calendar now knows about the invitation and its original sender. If you now delete it from your calendar, you'll be asked whether this should send a declination message to the person who organizes the event."
 msgstr ""
 
-#: ../../en_US/_plugins/calendar/invitations.rst:39
+#: ../../en_US/_plugins/calendar/invitations.rst:41
 msgid "After acceping or declining, the email message containing the invitation can be deleted."
 msgstr ""
 
-#: ../../en_US/_plugins/calendar/invitations.rst:43
+#: ../../en_US/_plugins/calendar/invitations.rst:45
 msgid "Process Invitation Replies"
 msgstr ""
 
-#: ../../en_US/_plugins/calendar/invitations.rst:45
+#: ../../en_US/_plugins/calendar/invitations.rst:47
 msgid "As an organizer who has invited others to an event, you'll receive responses to the automatically sent invitations when the attendees either accept or decline them."
 msgstr ""
 
-#: ../../en_US/_plugins/calendar/invitations.rst:48
+#: ../../en_US/_plugins/calendar/invitations.rst:50
 msgid "Such messages are also identified by the webmail system and again a yellow box appears in the message view:"
 msgstr ""
 
-#: ../../en_US/_plugins/calendar/invitations.rst:53
+#: ../../en_US/_plugins/calendar/invitations.rst:55
 msgid "By clicking the *Update the participant's status* button, the original event in your calendar will be updated with the RSVP status from the person who responded here."
 msgstr ""
 
-#: ../../en_US/_plugins/calendar/invitations.rst:56
+#: ../../en_US/_plugins/calendar/invitations.rst:58
 msgid "When you now look at the event details in the calendar view, the status icons next to each participant now displays the new status."
 msgstr ""
 
diff --git a/plugins/calendar/lib/calendar_recurrence.php b/plugins/calendar/lib/calendar_recurrence.php
index 44d5b08f..c0d7c793 100644
--- a/plugins/calendar/lib/calendar_recurrence.php
+++ b/plugins/calendar/lib/calendar_recurrence.php
@@ -75,7 +75,7 @@ class calendar_recurrence extends libcalendaring_recurrence
       }
 
       $next['recurrence_date'] = clone $next_start;
-      $next['_instance'] = libcalendaring::recurrence_instance_identifier($next);
+      $next['_instance'] = libcalendaring::recurrence_instance_identifier($next, $this->event['allday']);
 
       unset($next['_formatobj']);
 
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 557d9dae..3e3d77ad 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -36,7 +36,7 @@ class calendar_ui
     $this->rc = $cal->rc;
     $this->screen = $this->rc->task == 'calendar' ? ($this->rc->action ? $this->rc->action: 'calendar') : 'other';
   }
-    
+
   /**
    * Calendar UI initialization and requests handlers
    */
@@ -44,19 +44,22 @@ class calendar_ui
   {
     if ($this->ready)  // already done
       return;
-      
+
     // add taskbar button
     $this->cal->add_button(array(
-      'command' => 'calendar',
-      'class'   => 'button-calendar',
-      'classsel' => 'button-calendar button-selected',
+      'command'    => 'calendar',
+      'class'      => 'button-calendar',
+      'classsel'   => 'button-calendar button-selected',
       'innerclass' => 'button-inner',
-      'label'   => 'calendar.calendar',
+      'label'      => 'calendar.calendar',
+      'type'       => 'link'
       ), 'taskbar');
     
     // load basic client script
-    $this->cal->include_script('calendar_base.js');
-    
+    if ($this->rc->action != 'print') {
+      $this->cal->include_script('calendar_base.js');
+    }
+
     $skin_path = $this->cal->local_skin_path();
     $this->cal->include_stylesheet($skin_path . '/calendar.css');
     
@@ -79,9 +82,6 @@ class calendar_ui
     $this->cal->register_handler('plugin.sensitivity_select', array($this, 'sensitivity_select'));
     $this->cal->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
     $this->cal->register_handler('plugin.recurrence_form', array($this->cal->lib, 'recurrence_form'));
-    $this->cal->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
-    $this->cal->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
-    $this->cal->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
     $this->cal->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
     $this->cal->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
     $this->cal->register_handler('plugin.resources_form', array($this, 'resources_form'));
@@ -91,13 +91,16 @@ class calendar_ui
     $this->cal->register_handler('plugin.resource_calendar', array($this, 'resource_calendar'));
     $this->cal->register_handler('plugin.attendees_freebusy_table', array($this, 'attendees_freebusy_table'));
     $this->cal->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
+    $this->cal->register_handler('plugin.edit_recurrence_sync', array($this, 'edit_recurrence_sync'));
     $this->cal->register_handler('plugin.edit_recurring_warning', array($this, 'recurring_event_warning'));
     $this->cal->register_handler('plugin.event_rsvp_buttons', array($this, 'event_rsvp_buttons'));
-    $this->cal->register_handler('plugin.angenda_options', array($this, 'angenda_options'));
+    $this->cal->register_handler('plugin.agenda_options', array($this, 'agenda_options'));
     $this->cal->register_handler('plugin.events_import_form', array($this, 'events_import_form'));
     $this->cal->register_handler('plugin.events_export_form', array($this, 'events_export_form'));
     $this->cal->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
     $this->cal->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));  // use generic method from rcube_template
+
+    kolab_attachments_handler::ui();
   }
 
   /**
@@ -117,12 +120,7 @@ class calendar_ui
     $this->cal->include_script('calendar_ui.js');
     $this->cal->include_script('lib/js/fullcalendar.js');
     $this->rc->output->include_script('treelist.js');
-
-    // include kolab folderlist widget if available
-    if (in_array('libkolab', $this->cal->api->loaded_plugins())) {
-        $this->cal->api->include_script('libkolab/js/folderlist.js');
-        $this->cal->api->include_script('libkolab/js/audittrail.js');
-    }
+    $this->cal->api->include_script('libkolab/libkolab.js');
 
     jqueryui::miniColors();
   }
@@ -164,7 +162,7 @@ class calendar_ui
     foreach ((array)$calendars as $id => $prop) {
       if (!$prop['color'])
         continue;
-      $css .= $this->calendar_css_classes($id, $prop, $mode);
+      $css .= $this->calendar_css_classes($id, $prop, $mode, $attrib);
     }
     
     return html::tag('style', array('type' => 'text/css'), $css);
@@ -173,11 +171,18 @@ class calendar_ui
   /**
    *
    */
-  public function calendar_css_classes($id, $prop, $mode)
+  public function calendar_css_classes($id, $prop, $mode, $attrib = array())
   {
-    $color = $prop['color'];
+    $color = $folder_color = $prop['color'];
+
+    // replace white with skin-defined color
+    if (!empty($attrib['folder-fallback-color']) && preg_match('/^f+$/i', $folder_color)) {
+        $folder_color = $attrib['folder-fallback-color'];
+    }
+
     $class = 'cal-' . asciiwords($id, true);
-    $css .= "li .$class, #eventshow .$class { color: #$color; }\n";
+    $css   = str_replace('$class', $class, $attrib['folder-class']) ?: "li .$class";
+    $css  .= ", #eventshow .$class { color: #$folder_color; }\n";
 
     if ($mode != 1) {
       if ($mode == 3) {
@@ -202,11 +207,11 @@ class calendar_ui
   /**
    *
    */
-  function calendar_list($attrib = array())
+  function calendar_list($attrib = array(), $js_only = false)
   {
-    $html = '';
-    $jsenv = array();
-    $tree = true;
+    $html      = '';
+    $jsenv     = array();
+    $tree      = true;
     $calendars = $this->cal->driver->list_calendars(0, $tree);
 
     // walk folder tree
@@ -236,7 +241,13 @@ class calendar_ui
     }
 
     $this->rc->output->set_env('calendars', $jsenv);
-    $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
+
+    if ($js_only) {
+      return;
+    }
+
+    $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
+    $this->rc->output->add_gui_object('calendarslist', $attrib['id'] ?: 'unknown');
 
     return html::tag('ul', $attrib, $html, html::$common_attrib);
   }
@@ -308,8 +319,8 @@ class calendar_ui
     if (!$activeonly || $prop['active']) {
       $label_id = 'cl:' . $id;
       $content = html::div(join(' ', $classes),
-        html::span(array('class' => 'calname', 'id' => $label_id, 'title' => $title), $prop['editname'] ? rcube::Q($prop['editname']) : $prop['listname']) .
-        ($prop['virtual'] ? '' :
+        html::a(array('class' => 'calname', 'id' => $label_id, 'title' => $title, 'href' => '#'), rcube::Q($prop['editname'] ?: $prop['listname']))
+        . ($prop['virtual'] ? '' :
           html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id), '') .
           html::span('actions', 
             ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->cal->gettext('removelist')), ' ') : '') .
@@ -325,30 +336,35 @@ class calendar_ui
   }
 
   /**
-   *
+   * Render a HTML for agenda options form
    */
-  function angenda_options($attrib = array())
+  function agenda_options($attrib = array())
   {
     $attrib += array('id' => 'agendaoptions');
     $attrib['style'] .= 'display:none';
-    
-    $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange'));
+
+    $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange', 'class' => 'form-control custom-select'));
     $select_range->add(1 . ' ' . preg_replace('/\(.+\)/', '', $this->cal->lib->gettext('days')), $days);
     foreach (array(2,5,7,14,30,60,90,180,365) as $days)
       $select_range->add($days . ' ' . preg_replace('/\(|\)/', '', $this->cal->lib->gettext('days')), $days);
-    
-    $html .= html::label('agenda-listrange', $this->cal->gettext('listrange'));
-    $html .= $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']));
-    
-    $select_sections = new html_select(array('name' => 'listsections', 'id' => 'agenda-listsections'));
+
+    $html = html::span('input-group',
+        html::label(array('for' => 'agenda-listrange', 'class' => 'input-group-prepend'),
+            html::span('input-group-text', $this->cal->gettext('listrange')))
+        . $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']))
+    );
+
+    $select_sections = new html_select(array('name' => 'listsections', 'id' => 'agenda-listsections', 'class' => 'form-control custom-select'));
     $select_sections->add('---', '');
     foreach (array('day' => 'libcalendaring.days', 'week' => 'libcalendaring.weeks', 'month' => 'libcalendaring.months', 'smart' => 'calendar.smartsections') as $val => $label)
       $select_sections->add(preg_replace('/\(|\)/', '', ucfirst($this->rc->gettext($label))), $val);
-    
-    $html .= html::span('spacer', '&nbsp;');
-    $html .= html::label('agenda-listsections', $this->cal->gettext('listsections'));
-    $html .= $select_sections->show($this->rc->config->get('calendar_agenda_sections', $this->cal->defaults['calendar_agenda_sections']));
-    
+
+    $html .= html::span('input-group',
+        html::label(array('for' => 'agenda-listsections', 'class' => 'input-group-prepend'),
+            html::span('input-group-text', $this->cal->gettext('listsections')))
+        . $select_sections->show($this->rc->config->get('calendar_agenda_sections', $this->cal->defaults['calendar_agenda_sections']))
+    );
+
     return html::div($attrib, $html);
   }
 
@@ -410,7 +426,7 @@ class calendar_ui
     $select->add('---', '');
     $select->add($this->cal->gettext('status-confirmed'), 'CONFIRMED');
     $select->add($this->cal->gettext('status-cancelled'), 'CANCELLED');
-    //$select->add($this->cal->gettext('tentative'), 'TENTATIVE');
+    $select->add($this->cal->gettext('status-tentative'), 'TENTATIVE');
     return $select->show(null);
   }
 
@@ -471,28 +487,37 @@ class calendar_ui
   }
 
   /**
-   *
+   * Render HTML for attendee notification warning
    */
   function edit_attendees_notify($attrib = array())
   {
-    $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
+    $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox'));
     return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('sendnotifications')));
   }
 
+  /**
+   * Render HTML for recurrence option to align start date with the recurrence rule
+   */
+  function edit_recurrence_sync($attrib = array())
+  {
+    $checkbox = new html_checkbox(array('name' => '_start_sync', 'value' => 1, 'class' => 'pretty-checkbox'));
+    return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('eventstartsync')));
+  }
+
   /**
    * Generate the form for recurrence settings
    */
   function recurring_event_warning($attrib = array())
   {
     $attrib['id'] = 'edit-recurring-warning';
-    
+
     $radio = new html_radiobutton(array('name' => '_savemode', 'class' => 'edit-recurring-savemode'));
     $form = html::label(null, $radio->show('', array('value' => 'current')) . $this->cal->gettext('currentevent')) . ' ' .
        html::label(null, $radio->show('', array('value' => 'future')) . $this->cal->gettext('futurevents')) . ' ' .
        html::label(null, $radio->show('all', array('value' => 'all')) . $this->cal->gettext('allevents')) . ' ' .
        html::label(null, $radio->show('', array('value' => 'new')) . $this->cal->gettext('saveasnew'));
-       
-    return html::div($attrib, html::div('message', html::span('ui-icon ui-icon-alert', '') . $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
+
+    return html::div($attrib, html::div('message', $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
   }
 
   /**
@@ -512,8 +537,11 @@ class calendar_ui
     }
 
     $input = new html_inputfield(array(
-      'type' => 'file', 'name' => '_data', 'size' => $attrib['uploadfieldsize'],
-      'accept' => $accept));
+        'type'   => 'file',
+        'name'   => '_data',
+        'size'   => $attrib['uploadfieldsize'],
+        'accept' => $accept
+    ));
 
     $select = new html_select(array('name' => '_range', 'id' => 'event-import-range'));
     $select->add(array(
@@ -526,28 +554,32 @@ class calendar_ui
       ),
       array('1','2','3','6','12',0));
 
-    $html .= html::div('form-section',
-      html::div(null, $input->show()) .
-      html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
+    $html = html::div('form-section form-group row',
+      html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
+      . html::div('col-sm-8', $input->show()
+        . html::div('hint', $this->rc->gettext(array('id' => 'importfile', 'name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
     );
 
-    $html .= html::div('form-section',
-      html::label('event-import-calendar', $this->cal->gettext('calendar')) .
-      $this->calendar_select(array('name' => 'calendar', 'id' => 'event-import-calendar'))
+    $html .= html::div('form-section form-group row',
+      html::label(array('for' => 'event-import-calendar', 'class' => 'col-form-label col-sm-4'), $this->cal->gettext('calendar'))
+      . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-import-calendar')))
     );
 
-    $html .= html::div('form-section',
-      html::label('event-import-range', $this->cal->gettext('importrange')) .
-      $select->show(1)
+    $html .= html::div('form-section form-group row',
+      html::label(array('for' => 'event-import-range', 'class' => 'col-form-label col-sm-4'), $this->cal->gettext('importrange'))
+      . html::div('col-sm-8', $select->show(1))
     );
 
     $this->rc->output->add_gui_object('importform', $attrib['id']);
     $this->rc->output->add_label('import');
 
-    return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'import_events')),
-      'method' => "post", 'enctype' => 'multipart/form-data', 'id' => $attrib['id']),
-      $html
-    );
+    return html::tag('p', null, $this->cal->gettext('importtext'))
+      . html::tag('form', array(
+          'action'  => $this->rc->url(array('task' => 'calendar', 'action' => 'import_events')),
+          'method'  => 'post',
+          'enctype' => 'multipart/form-data',
+          'id'      => $attrib['id']
+        ), $html);
   }
 
   /**
@@ -558,12 +590,11 @@ class calendar_ui
     if (!$attrib['id'])
       $attrib['id'] = 'rcmExportForm';
 
-    $html .= html::div('form-section',
-      html::label('event-export-calendar', $this->cal->gettext('calendar')) .
-      $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar'))
-    );
+    $html = html::div('form-section form-group row',
+      html::label(array('for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('calendar'))
+        . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar', 'class' => 'form-control custom-select'))));
 
-    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range'));
+    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range', 'class' => 'form-control custom-select'));
     $select->add(array(
         $this->cal->gettext('all'),
         $this->cal->gettext('onemonthback'),
@@ -577,106 +608,63 @@ class calendar_ui
 
     $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate'));
 
-    $html .= html::div('form-section',
-      html::label('event-export-range', $this->cal->gettext('exportrange')) .
-      $select->show(0) .
-      html::span(array('style'=>'display:none'), $startdate->show())
-    );
+    $html .= html::div('form-section form-group row',
+      html::label(array('for' => 'event-export-range', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('exportrange'))
+        . html::div('col-sm-8', $select->show(0) . html::span(array('style'=>'display:none'), $startdate->show())));
 
-    $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1));
-    $html .= html::div('form-section',
-      html::label('event-export-range', $this->cal->gettext('exportattachments')) .
-      $checkbox->show(1)
-    );
+    $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox'));
+    $html .= html::div('form-section form-check row',
+      html::label(array('for' => 'event-export-attachments', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('exportattachments'))
+        . html::div('col-sm-8', $checkbox->show(1)));
 
     $this->rc->output->add_gui_object('exportform', $attrib['id']);
 
-    return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'export_events')),
-      'method' => "post", 'id' => $attrib['id']),
+    return html::tag('form', $attrib + array(
+        'action' => $this->rc->url(array('task' => 'calendar', 'action' => 'export_events')),
+        'method' => "post",
+        'id' => $attrib['id']
+      ),
       $html
     );
   }
 
-  /**
-   * Generate the form for event attachments upload
-   */
-  function attachments_form($attrib = array())
-  {
-    // add ID if not given
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmUploadForm';
-
-    // Get max filesize, enable upload progress bar
-    $max_filesize = $this->rc->upload_init();
-
-    $button = new html_inputfield(array('type' => 'button'));
-    $input = new html_inputfield(array(
-      'type' => 'file', 'name' => '_attachments[]',
-      'multiple' => 'multiple', 'size' => $attrib['attachmentfieldsize']));
-
-    return html::div($attrib,
-      html::div(null, $input->show()) .
-      html::div('buttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
-        'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
-      html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
-    );
-  }
-
-  /**
-   * Register UI object for HTML5 drag & drop file upload
-   */
-  function file_drop_area($attrib = array())
-  {
-      if ($attrib['id']) {
-          $this->rc->output->add_gui_object('filedrop', $attrib['id']);
-          $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
-      }
-  }
-
-  /**
-   * Generate HTML element for attachments list
-   */
-  function attachments_list($attrib = array())
-  {
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmAttachmentList';
-
-    $skin_path = $this->cal->local_skin_path();
-    if ($attrib['deleteicon']) {
-      $_SESSION[calendar::SESSION_KEY . '_deleteicon'] = $skin_path . $attrib['deleteicon'];
-      $this->rc->output->set_env('deleteicon', $skin_path . $attrib['deleteicon']);
-    }
-    if ($attrib['cancelicon'])
-      $this->rc->output->set_env('cancelicon', $skin_path . $attrib['cancelicon']);
-    if ($attrib['loadingicon'])
-      $this->rc->output->set_env('loadingicon', $skin_path . $attrib['loadingicon']);
-
-    $this->rc->output->add_gui_object('attachmentlist', $attrib['id']);
-    $this->attachmentlist_id = $attrib['id'];
-
-    return html::tag('ul', $attrib, '', html::$common_attrib);
-  }
-
   /**
    * Handler for calendar form template.
    * The form content could be overriden by the driver
    */
   function calendar_editform($action, $calendar = array())
+  {
+    $this->action   = $action;
+    $this->calendar = $calendar;
+
+    // load miniColors js/css files
+    jqueryui::miniColors();
+
+    $this->rc->output->set_env('pagetitle', $this->cal->gettext('calendarprops'));
+    $this->rc->output->add_handler('folderform', array($this, 'calendarform'));
+    $this->rc->output->send('libkolab.folderform');
+  }
+
+  /**
+   * Handler for calendar form template.
+   * The form content could be overriden by the driver
+   */
+  function calendarform($attrib)
   {
     // compose default calendar form fields
-    $input_name = new html_inputfield(array('name' => 'name', 'id' => 'calendar-name', 'size' => 20));
-    $input_color = new html_inputfield(array('name' => 'color', 'id' => 'calendar-color', 'size' => 6));
+    $input_name  = new html_inputfield(array('name' => 'name', 'id' => 'calendar-name', 'size' => 20));
+    $input_color = new html_inputfield(array('name' => 'color', 'id' => 'calendar-color', 'size' => 7, 'class' => 'colors'));
 
     $formfields = array(
       'name' => array(
         'label' => $this->cal->gettext('name'),
         'value' => $input_name->show($calendar['name']),
-        'id' => 'calendar-name',
+        'id'    => 'calendar-name',
       ),
       'color' => array(
         'label' => $this->cal->gettext('color'),
         'value' => $input_color->show($calendar['color']),
-        'id' => 'calendar-color',
+        'id'    => 'calendar-color',
       ),
     );
 
@@ -684,14 +672,14 @@ class calendar_ui
       $checkbox = new html_checkbox(array('name' => 'showalarms', 'id' => 'calendar-showalarms', 'value' => 1));
       $formfields['showalarms'] = array(
         'label' => $this->cal->gettext('showalarms'),
-        'value' => $checkbox->show($calendar['showalarms']?1:0),
-        'id' => 'calendar-showalarms',
+        'value' => $checkbox->show($this->calendar['showalarms'] ? 1 :0),
+        'id'    => 'calendar-showalarms',
       );
     }
 
     // allow driver to extend or replace the form content
-    return html::tag('form', array('action' => "#", 'method' => "get", 'id' => 'calendarpropform'),
-      $this->cal->driver->calendar_form($action, $calendar, $formfields)
+    return html::tag('form', $attrib + array('action' => "#", 'method' => "get", 'id' => 'calendarpropform'),
+      $this->cal->driver->calendar_form($this->action, $this->calendar, $formfields)
     );
   }
 
@@ -712,7 +700,7 @@ class calendar_ui
     $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
     if ($invitations) {
       $table->add_header(array('class' => 'invite', 'title' => $this->cal->gettext('sendinvitations')),
-        $invite->show(1) . html::label('edit-attendees-invite', $this->cal->gettext('sendinvitations')));
+        $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->cal->gettext('sendinvitations'))));
     }
     $table->add_header('options', '');
 
@@ -731,15 +719,15 @@ class calendar_ui
    */
   function attendees_form($attrib = array())
   {
-    $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
-    $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
+    $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'class' => 'form-control'));
+    $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment', 'class' => 'form-control',
         'rows' => 4, 'cols' => 55, 'title' => $this->cal->gettext('itipcommenttitle')));
 
     return html::div($attrib,
-      html::div(null, $input->show() . " " .
+      html::div('form-searchbar', $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->cal->gettext('addattendee'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->cal->gettext('scheduletime').'...'))) .
-      html::p('attendees-commentbox', html::label(null, $this->cal->gettext('itipcomment') . $textarea->show()))
+      html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->cal->gettext('itipcomment')) . $textarea->show())
     );
   }
 
@@ -748,10 +736,10 @@ class calendar_ui
    */
   function resources_form($attrib = array())
   {
-    $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'size' => 30));
+    $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'class' => 'form-control'));
 
     return html::div($attrib,
-      html::div(null, $input->show() . " " .
+      html::div('form-searchbar', $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-add', 'value' => $this->cal->gettext('addresource'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-find', 'value' => $this->cal->gettext('findresources').'...')))
       );
@@ -817,20 +805,17 @@ class calendar_ui
    */
   function resources_search_form($attrib)
   {
-    $attrib += array('command' => 'search-resource', 'id' => 'rcmcalresqsearchbox', 'autocomplete' => 'off');
-    $attrib['name'] = '_q';
-
-    $input_q = new html_inputfield($attrib);
-    $out = $input_q->show();
+    $attrib += array(
+        'command'       => 'search-resource',
+        'reset-command' => 'reset-resource-search',
+        'id'            => 'rcmcalresqsearchbox',
+        'autocomplete'  => 'off',
+        'form-name'     => 'rcmcalresoursqsearchform',
+        'gui-object'    => 'resourcesearchform',
+    );
 
     // add form tag around text field
-    $out = $this->rc->output->form_tag(array(
-      'name' => "rcmcalresoursqsearchform",
-      'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('" . $attrib['command'] . "'); return false",
-      'style' => "display:inline"),
-      $out);
-
-    return $out;
+    return $this->rc->output->search_form($attrib);
   }
 
   /**
diff --git a/plugins/calendar/localization/bg.inc b/plugins/calendar/localization/bg.inc
new file mode 100644
index 00000000..5f7dd9e4
--- /dev/null
+++ b/plugins/calendar/localization/bg.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['removelist'] = 'Премахване от списъка';
+$labels['calendarsubscribe'] = 'Постоянен списък';
+?>
diff --git a/plugins/calendar/localization/bg_BG.inc b/plugins/calendar/localization/bg_BG.inc
index afbdfe11..a631db7a 100644
--- a/plugins/calendar/localization/bg_BG.inc
+++ b/plugins/calendar/localization/bg_BG.inc
@@ -8,6 +8,7 @@
  */
 $labels['default_view'] = 'Изглед по подразбиране';
 $labels['time_format'] = 'Формат на часовете';
+$labels['timeslots'] = 'Деления за час';
 $labels['first_day'] = 'Първи ден от седмицата';
 $labels['first_hour'] = 'Първи час при показване';
 $labels['workinghours'] = 'Работни часове';
@@ -19,6 +20,13 @@ $labels['coloringmode0'] = 'Според календара';
 $labels['coloringmode1'] = 'Относно категорията';
 $labels['coloringmode2'] = 'Календар за очертание, категория за съдържание';
 $labels['coloringmode3'] = 'Категория за очертание, календар за съдържание';
+$labels['afternothing'] = 'Не предприемай нищо';
+$labels['aftertrash'] = 'Премести в Кошчето';
+$labels['afterdelete'] = 'Изтрий съобщението';
+$labels['afterflagdeleted'] = 'Маркирай като изтрито';
+$labels['aftermoveto'] = 'Премести в...';
+$labels['itipoptions'] = 'Покани за събитие';
+$labels['weeknonone'] = 'never';
 $labels['calendar'] = 'Календар';
 $labels['calendars'] = 'Календари';
 $labels['category'] = 'Категория';
@@ -36,6 +44,7 @@ $labels['new_event'] = 'Добавяне на събитие';
 $labels['edit_event'] = 'Промяна на събитие';
 $labels['edit'] = 'Промяна';
 $labels['save'] = 'Запис';
+$labels['removelist'] = 'Премахни от списъка';
 $labels['cancel'] = 'Отказ';
 $labels['select'] = 'Избиране';
 $labels['print'] = 'Печат';
@@ -46,30 +55,49 @@ $labels['all-day'] = 'цял ден';
 $labels['export'] = 'Извличане';
 $labels['exporttitle'] = 'Извличане към iCalendar';
 $labels['exportrange'] = 'Събития от';
+$labels['exportattachments'] = 'С прикачени файлове';
+$labels['customdate'] = 'Дата по избор';
 $labels['location'] = 'Местоположение';
+$labels['url'] = 'URL адрес';
 $labels['date'] = 'Дата';
 $labels['start'] = 'Начало';
+$labels['starttime'] = 'Време за начало';
 $labels['end'] = 'Край';
+$labels['endtime'] = 'Време за край';
+$labels['repeat'] = 'Повтори';
 $labels['selectdate'] = 'Избор на дата';
 $labels['freebusy'] = 'Показване като';
 $labels['free'] = 'Свободно';
 $labels['busy'] = 'Заето';
 $labels['outofoffice'] = 'Извън офиса';
 $labels['tentative'] = 'Предварително';
+$labels['mystatus'] = 'Моят статус';
 $labels['status'] = 'Статус';
+$labels['status-confirmed'] = 'Потвърдено';
+$labels['status-cancelled'] = 'Отхвърлено';
+$labels['status-tentative'] = 'Предварително';
 $labels['priority'] = 'Приоритет';
-$labels['sensitivity'] = 'Частност';
+$labels['sensitivity'] = 'Поверителност';
 $labels['public'] = 'публично';
 $labels['private'] = 'частно';
 $labels['confidential'] = 'конфиденциално';
+$labels['links'] = 'Цикличност';
 $labels['alarms'] = 'Напомняне';
+$labels['comment'] = 'Коментар';
+$labels['created'] = 'Създаден';
+$labels['changed'] = 'Последна промяна';
 $labels['unknown'] = 'Неизвестно';
+$labels['eventoptions'] = 'Опции';
 $labels['generated'] = 'генерирано в';
+$labels['eventhistory'] = 'История';
+$labels['removelink'] = 'Премахни е-мейл препратките';
 $labels['printdescriptions'] = 'Печат на описанията';
 $labels['parentcalendar'] = 'Внасяне вътре';
 $labels['searchearlierdates'] = '« Търсене за по- стари събития';
 $labels['searchlaterdates'] = 'Търсене за по- нови събития »';
+$labels['laterevents'] = 'Късно';
 $labels['andnmore'] = '$nr повече...';
+$labels['togglerole'] = 'Натиснете за превключване на роля';
 $labels['createfrommail'] = 'Запазване като събитие';
 $labels['importevents'] = 'Внасяне на събития';
 $labels['importrange'] = 'Събития от';
@@ -77,6 +105,15 @@ $labels['onemonthback'] = '1 месец назад';
 $labels['nmonthsback'] = '$nr месеца назад';
 $labels['showurl'] = 'Показване на URL на календара';
 $labels['showurldescription'] = 'Използвайте следния адрес, за да достъпвате (само за четене) вашия календар от други приложения. Можете да копирате и поставяте това във всеки календарен софтуер, поддържащ форматът iCal';
+$labels['searchterms'] = 'Търсене за';
+$labels['calendarsubscribe'] = 'Постоянен списък';
+$labels['nocalendarsfound'] = 'Не бяха намерени календари';
+$labels['nrcalendarsfound'] = 'Бяха намерени $nr календара';
+$labels['quickview'] = 'Покажи само този календар';
+$labels['invitationspending'] = 'Чакащи покани';
+$labels['invitationsdeclined'] = 'Отхвърлени покани';
+$labels['changepartstat'] = 'Промени състоянието на участник';
+$labels['rsvpcomment'] = 'Текст на поканата';
 $labels['listrange'] = 'Оразмеряване към екран:';
 $labels['listsections'] = 'Разделяне на:';
 $labels['smartsections'] = 'Интелигентни секции';
@@ -85,38 +122,77 @@ $labels['today'] = 'Днес';
 $labels['tomorrow'] = 'Утре';
 $labels['thisweek'] = 'Тази седмица';
 $labels['nextweek'] = 'Следващата седмица';
+$labels['prevweek'] = 'Миналата седмица';
 $labels['thismonth'] = 'Този месец';
 $labels['nextmonth'] = 'Следващия месец';
 $labels['weekofyear'] = 'Седмица';
 $labels['pastevents'] = 'Минали';
 $labels['futureevents'] = 'Бъдещи';
+$labels['showalarms'] = 'Покажи напомняния';
 $labels['defaultalarmtype'] = 'Настройка за напомняне по подразбиране';
 $labels['defaultalarmoffset'] = 'Време за напомняне по подразбиране';
 $labels['attendee'] = 'Участник';
 $labels['role'] = 'Роля';
+$labels['availability'] = 'Налич.';
 $labels['confirmstate'] = 'Статус';
 $labels['addattendee'] = 'Добавяне на участник';
 $labels['roleorganizer'] = 'Организатор';
 $labels['rolerequired'] = 'Задължителен';
 $labels['roleoptional'] = 'По избор';
-$labels['availfree'] = 'Свободно';
-$labels['availbusy'] = 'Заето';
-$labels['availunknown'] = 'Неизвестно';
+$labels['rolechair'] = 'Председател';
+$labels['rolenonparticipant'] = 'Липсващ';
+$labels['cutypeindividual'] = 'Индивидуален';
+$labels['cutypegroup'] = 'Група';
+$labels['cutyperesource'] = 'Ресурс';
+$labels['cutyperoom'] = 'Стая';
+$labels['availfree'] = 'Свободен';
+$labels['availbusy'] = 'Зает';
+$labels['availunknown'] = 'Няма информация';
 $labels['availtentative'] = 'Предварително';
 $labels['availoutofoffice'] = 'Извън офиса';
 $labels['sendinvitations'] = 'Изпращане на покани';
 $labels['sendnotifications'] = 'Известяване на участниците относно промените';
 $labels['sendcancellation'] = 'Известяване на участниците относно отмяна на събития';
+$labels['invitationsubject'] = 'Бяхте поканен на "$title"';
+$labels['eventupdatesubject'] = '"$title" беше отмнено';
 $labels['itipdeclineevent'] = 'Искате ли да отхвърлите поканата за това събитие?';
 $labels['saveincalendar'] = 'запазване в';
+$labels['updatemycopy'] = 'Обнови в моя календар';
+$labels['savetocalendar'] = 'Запази в календар';
+$labels['openpreview'] = 'Провери календар';
+$labels['noearlierevents'] = 'Няма по-ранни събития';
+$labels['nolaterevents'] = 'Няма по-късни събития';
+$labels['resource'] = 'Ресурс';
+$labels['resourcedetails'] = 'Детайли';
+$labels['resourceowner'] = 'Собственик';
 $labels['tabsummary'] = 'Заглавие';
+$labels['tabrecurrence'] = 'Да се повтаря';
 $labels['tabattendees'] = 'Участници';
+$labels['tabresources'] = 'Ресурси';
 $labels['tabattachments'] = 'Прикрепени файлове';
 $labels['tabsharing'] = 'Споделяне';
 $labels['deleteobjectconfirm'] = 'Наистина ли искате да премахнете това събитие?';
 $labels['deleteventconfirm'] = 'Наистина ли искате да премахнете това събитие?';
 $labels['deletecalendarconfirm'] = 'Наистина ли искате да премахнете този календар с всичките му събития?';
+$labels['deletecalendarconfirmrecursive'] = 'Наистина ли искате да премахнете този календар с всичките му събития и допълнителни календари?';
 $labels['savingdata'] = 'Запазване на данни...';
 $labels['errorsaving'] = 'Неуспешно записването на промените.';
+$labels['successremoval'] = 'Събитието беше премахнато успешно.';
+$labels['successrestore'] = 'Събитието беше възстановено успешно.';
+$labels['importedsuccessfully'] = 'Събитието е добавено успешно към \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Събитието беше обновено успешно в \'$calendar\'';
+$labels['importsuccess'] = '$nr събития бяха внесени успешно.';
+$labels['importnone'] = 'Не бяха намерени събития за внасяне';
+$labels['importerror'] = 'Възникна грешка при внасянето на събития';
+$labels['aclnorights'] = 'Не разполагате с административни права върху този календар.';
+$labels['changeeventconfirm'] = 'Промяна на събитие';
+$labels['removeeventconfirm'] = 'Изтриване на събитие';
+$labels['currentevent'] = 'Настоящи';
 $labels['futurevents'] = 'Бъдещи';
+$labels['allevents'] = 'Всички';
+$labels['saveasnew'] = 'Запази като нов';
+$labels['birthdays'] = 'Рождени дни';
+$labels['arialabelcalendarview'] = 'Преглед на календара';
+$labels['arialabeleventattendees'] = 'Списък с участниците в събитието';
+$labels['arialabelresourceselection'] = 'Налични ресурси';
 ?>
diff --git a/plugins/calendar/localization/ca_ES.inc b/plugins/calendar/localization/ca_ES.inc
index 0ba9ef35..a75ab3dd 100644
--- a/plugins/calendar/localization/ca_ES.inc
+++ b/plugins/calendar/localization/ca_ES.inc
@@ -75,6 +75,7 @@ $labels['mystatus'] = 'El meu estat';
 $labels['status'] = 'Estat';
 $labels['status-confirmed'] = 'Confirmat';
 $labels['status-cancelled'] = 'Cancel·lat';
+$labels['status-tentative'] = 'Provisional';
 $labels['priority'] = 'Prioritat';
 $labels['sensitivity'] = 'Privadesa';
 $labels['public'] = 'públic';
@@ -94,6 +95,7 @@ $labels['printdescriptions'] = 'Imprimeix descripcions';
 $labels['parentcalendar'] = 'Insereix dins';
 $labels['searchearlierdates'] = '« Cerca els esdeveniments d\'abans';
 $labels['searchlaterdates'] = 'Cerca els esdeveniments de després »';
+$labels['laterevents'] = 'Després';
 $labels['andnmore'] = '$nr més...';
 $labels['togglerole'] = 'Feu clic per commutar el rol';
 $labels['createfrommail'] = 'Desa com a esdeveniment';
@@ -151,8 +153,6 @@ $labels['availbusy'] = 'Ocupat';
 $labels['availunknown'] = 'Desconegut';
 $labels['availtentative'] = 'Provisional';
 $labels['availoutofoffice'] = 'Fora de l\'oficina';
-$labels['delegatedto'] = 'Delegat a:';
-$labels['delegatedfrom'] = 'Delegat de:';
 $labels['scheduletime'] = 'Cerca disponibilitat';
 $labels['sendinvitations'] = 'Envia invitacions';
 $labels['sendnotifications'] = 'Notifica als participants quan hi hagi modificacions';
@@ -164,12 +164,10 @@ $labels['nextslot'] = 'Lloc següent';
 $labels['suggestedslot'] = 'Lloc suggerit';
 $labels['noslotfound'] = 'No s\'ha pogut trobar un espai de temps lliure';
 $labels['invitationsubject'] = 'Heu estat convidats a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuan: \$date\n\nConvidats: \$attendees\n\nSi us plau cerqueu el fitxer iCalendar adjunt dins dels detalls de l'esdeveniment per poder-lo importar a la vostra aplicació de calendari.";
 $labels['invitationattendlinks'] = "En cas que el vostre client de correu electrònic no suporti peticions de tipus iTip, podeu fer servir el següent enllaç per acceptar o declinar aquesta invitació:\n\$url";
 $labels['eventupdatesubject'] = '"$title" ha estat actualitzat';
 $labels['eventupdatesubjectempty'] = 'Un esdeveniment que us afecta ha estat actualitzat';
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuan: \$date\n\nConvidats: \$attendees\n\nSi us plau cerqueu el fitxer iCalendar adjunt dins dels detalls actualitzats de l'esdeveniment per poder-lo importar a la vostra aplicació de calendari.";
-$labels['eventcancelsubject'] = '"$title" ha estat cancel·lat';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuan: \$date\n\nConvidats: \$attendees\n\nL'esdeveniment ha estat cancel·lat per \$organizer.\n\nSi us plau cerqueu el fitxer iCalendar adjunt amb els detalls actualitzats de l'esdeveniment.";
 $labels['itipobjectnotfound'] = 'L\'esdeveniment que fa referència aquest missatge no s\'ha trobat al vostre calendari.';
 $labels['itipmailbodyaccepted'] = "\$sender ha acceptat la invitació al següent esdeveniment:\n\n*\$title*\n\nQuan: \$date\n\nConvidats: \$attendees";
diff --git a/plugins/calendar/localization/cs_CZ.inc b/plugins/calendar/localization/cs_CZ.inc
index 32d40407..ce8a9ed5 100644
--- a/plugins/calendar/localization/cs_CZ.inc
+++ b/plugins/calendar/localization/cs_CZ.inc
@@ -27,10 +27,15 @@ $labels['afterflagdeleted'] = 'Označit jako smazané';
 $labels['aftermoveto'] = 'Přesunout do...';
 $labels['itipoptions'] = 'Pozvání na událost';
 $labels['afteraction'] = 'Poté co jsou pozvání nebo aktualizace zprávy zpracovány';
+$labels['showweekno'] = 'Zobrazit čísla týdnů';
+$labels['weeknonone'] = 'nikdy';
+$labels['weeknodatepicker'] = 'pouze ve sběrači dat';
+$labels['weeknoall'] = 'v pohledu na sběrač dat a na kalendář';
 $labels['calendar'] = 'Kalendář';
 $labels['calendars'] = 'Kalendáře';
 $labels['category'] = 'Kategorie';
 $labels['categories'] = 'Kategorie';
+$labels['addcalendar'] = 'Přidat kalendář';
 $labels['createcalendar'] = 'Vytvořit nový kalendář';
 $labels['editcalendar'] = 'Upravit vlastnosti kalendáře';
 $labels['name'] = 'Název';
@@ -75,6 +80,7 @@ $labels['mystatus'] = 'Můj stav';
 $labels['status'] = 'Stav';
 $labels['status-confirmed'] = 'Potvrzeno';
 $labels['status-cancelled'] = 'Zrušeno';
+$labels['status-tentative'] = 'Nezávazně';
 $labels['priority'] = 'Přednost';
 $labels['sensitivity'] = 'Soukromí';
 $labels['public'] = 'veřejné';
@@ -94,6 +100,8 @@ $labels['printdescriptions'] = 'Vytisknout popisy';
 $labels['parentcalendar'] = 'Vložit dovnitř';
 $labels['searchearlierdates'] = '« Hledat dřívější události';
 $labels['searchlaterdates'] = 'Hledat pozdější události »';
+$labels['earlierevents'] = 'Dříve';
+$labels['laterevents'] = 'Později';
 $labels['andnmore'] = 'dalších $nr...';
 $labels['togglerole'] = 'Klepněte k přepnutí role';
 $labels['createfrommail'] = 'Uložit jako událost';
@@ -104,8 +112,10 @@ $labels['nmonthsback'] = '$nr měsíců nazpátek';
 $labels['showurl'] = 'Ukázat adresu (URL) kalendáře';
 $labels['showurldescription'] = 'Tuto adresu použijte pro přístup (jen ke čtení) ke kalendáři z jiných aplikací. Můžete ji zkopírovat a vložit do jakéhokoli kalendářového softwaru, který podporuje formát iCal.';
 $labels['caldavurldescription'] = 'Zkopírujte tuto adresu do aplikace <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> klienta (např. Evolution nebo Mozilla Thunderbird) pro úplné synchronizování tohoto adresáře s vaším počítačem nebo mobilním zařízením.';
+$labels['showfburl'] = 'Ukázat volnou/obsazenou adresu';
 $labels['findcalendars'] = 'Najít kalendáře...';
 $labels['searchterms'] = 'Hledané výrazy';
+$labels['findevents'] = 'Najít události';
 $labels['calsearchresults'] = 'Dostupné kalendáře';
 $labels['calendarsubscribe'] = 'Ukazovat seznam trvale';
 $labels['nocalendarsfound'] = 'Nenalezeny žádné kalendáře';
@@ -115,6 +125,8 @@ $labels['invitationspending'] = 'Pozvání čekající na vyřízení';
 $labels['invitationsdeclined'] = 'Odmítnutá pozvání';
 $labels['changepartstat'] = 'Změnit stav příjemce';
 $labels['rsvpcomment'] = 'Text pozvánky';
+$labels['eventstartsync'] = 'Posunout začátek události k prvnímu výskytu';
+$labels['weekshort'] = 'Týd';
 $labels['listrange'] = 'Rozsah k zobrazení:';
 $labels['listsections'] = 'Rozdělit na:';
 $labels['smartsections'] = 'Chytré sekce';
@@ -151,8 +163,6 @@ $labels['availbusy'] = 'Obsazeno';
 $labels['availunknown'] = 'Neznámý';
 $labels['availtentative'] = 'Nezávazně';
 $labels['availoutofoffice'] = 'Mimo kancelář';
-$labels['delegatedto'] = 'Pověřený:';
-$labels['delegatedfrom'] = 'Pověřující:';
 $labels['scheduletime'] = 'Najít dostupnost';
 $labels['sendinvitations'] = 'Poslat pozvánky';
 $labels['sendnotifications'] = 'Uvědomit účastníky o změnách';
@@ -164,7 +174,6 @@ $labels['nextslot'] = 'Další místo v rozvrhu';
 $labels['suggestedslot'] = 'Navržené místo v rozvrhu';
 $labels['noslotfound'] = 'Nelze najít volné místo v rozvrhu';
 $labels['invitationsubject'] = 'Byl(a) jste pozván(a) na událost "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nPodrobnosti o události najdete v přiloženém souboru typu iCalendar. Můžete si ho zavést do kalendářového programu.";
 $labels['invitationattendlinks'] = "Pokud váš poštovní klient nepodporuje pozvánky iTip, použijte prosím následující odkaz k potvrzení nebo odmítnutí pozvání:\n\$url";
 $labels['eventupdatesubject'] = 'Událost "$title" byla aktualizována';
 $labels['eventupdatesubjectempty'] = 'Událost, která se vás týká, byla aktualizována';
@@ -190,11 +199,13 @@ $labels['savetocalendar'] = 'Uložit do kalenáře';
 $labels['openpreview'] = 'Ověřit kalendář';
 $labels['noearlierevents'] = 'Žádné dřívější události';
 $labels['nolaterevents'] = 'Žádné pozdější události';
+$labels['legend'] = 'Vysvětlivka';
 $labels['resource'] = 'Zdroj';
 $labels['addresource'] = 'Zapsat zdroj';
 $labels['findresources'] = 'Najít zdroje';
 $labels['resourcedetails'] = 'Podrobnosti';
 $labels['resourceavailability'] = 'Dostupnost';
+$labels['resourceprops'] = 'Vlastnosti zdroje';
 $labels['resourceowner'] = 'Vlastník';
 $labels['resourceadded'] = 'Zdroj byl přidán do vaší události';
 $labels['tabsummary'] = 'Souhrn';
@@ -223,6 +234,7 @@ $labels['nowritecalendarfound'] = 'Nebyl nalezen žádný kalendář, do kteréh
 $labels['importedsuccessfully'] = 'Událost byla úspěšně přidána do kalendáře \'$calendar\'';
 $labels['updatedsuccessfully'] = 'Událost byla úspěšně aktualizována v \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Stav účastníka byl úspěšně aktualizován';
+$labels['errorunknownattendee'] = 'Nepodařilo se najít údaje o účastníkovi.';
 $labels['itipsendsuccess'] = 'Pozvánky byly rozeslány účastníkům.';
 $labels['itipresponseerror'] = 'Nelze odeslat odpověď na tuto pozvánku';
 $labels['itipinvalidrequest'] = 'Tato pozvánka již není platná';
@@ -232,10 +244,12 @@ $labels['importsuccess'] = 'Úspěšně zavedeno $nr událostí';
 $labels['importnone'] = 'Nebyly nalezeny žádné události k zavedení';
 $labels['importerror'] = 'Při zavádění došlo k chybě';
 $labels['aclnorights'] = 'Nemáte administrátorská práva k tomuto kalendáři.';
+$labels['importtext'] = 'Můžete nahrávat události ve formátu <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> (.ics).';
 $labels['changeeventconfirm'] = 'Změnit událost';
 $labels['removeeventconfirm'] = 'Smazat událost';
 $labels['changerecurringeventwarning'] = 'Toto je opakovaná událost. Chcete upravit jen toto konání, toto a všechna následující konání, úplně všechna konání nebo uložit událost jako novou?';
 $labels['removerecurringeventwarning'] = 'Toto je opakovaná událost. Chcete smazat jen toto konání, toto a všechna následující konání, nebo úplně všechna konání?';
+$labels['removerecurringallonly'] = 'Toto je opakovaná událost. Jako účastník můžete smazat pouze celou událost se všemi konáními.';
 $labels['currentevent'] = 'Nynější';
 $labels['futurevents'] = 'Budoucí';
 $labels['allevents'] = 'Vše';
@@ -247,18 +261,23 @@ $labels['birthdayscalendarsources'] = 'Z těchto adresářů';
 $labels['birthdayeventtitle'] = 'Narozeniny $name';
 $labels['birthdayage'] = 'Věk $age';
 $labels['objectchangelog'] = 'Historie změn';
+$labels['objectdiff'] = 'Změny od $rev1 do $rev2';
 $labels['objectnotfound'] = 'Nepodařilo se nahrát data události';
 $labels['objectchangelognotavailable'] = 'Historie změn není pro tuto událost dostupná';
 $labels['objectdiffnotavailable'] = 'Pro vybrané verze není žádné srovnání možné';
 $labels['revisionrestoreconfirm'] = 'Opravdu chcete obnovit změnu $rev této události? Tímto dojde k nahrazení nynější události starou verzí.';
+$labels['objectrestoresuccess'] = 'Pozměnění $rev úspěšně obnoveno';
+$labels['objectrestoreerror'] = 'Nepodařilo se obnovit staré pozměnění';
 $labels['arialabelminical'] = 'Výběr data v kalendáři';
 $labels['arialabelcalendarview'] = 'Pohled na kalendář';
 $labels['arialabelsearchform'] = 'Hledání události';
 $labels['arialabelquicksearchbox'] = 'Zadání hledání události';
 $labels['arialabelcalsearchform'] = 'Hledání kalendářů';
 $labels['calendaractions'] = 'Činnosti v kalendáři';
+$labels['calendarprops'] = 'Vlastnosti kalendáře';
 $labels['arialabeleventattendees'] = 'Seznam účastníků události';
 $labels['arialabeleventresources'] = 'Seznam zdrojů události';
 $labels['arialabelresourcesearchform'] = 'Hledání zdrojů';
 $labels['arialabelresourceselection'] = 'Dostupné zdroje';
+$labels['arialabeleventform'] = 'Úprava události';
 ?>
diff --git a/plugins/calendar/localization/da_DK.inc b/plugins/calendar/localization/da_DK.inc
index b2adee8a..6f059877 100644
--- a/plugins/calendar/localization/da_DK.inc
+++ b/plugins/calendar/localization/da_DK.inc
@@ -27,6 +27,7 @@ $labels['afterflagdeleted'] = 'Markér som slettet';
 $labels['aftermoveto'] = 'Flyt til ...';
 $labels['itipoptions'] = 'Begivenhedsinvitationer';
 $labels['afteraction'] = 'Efter en invitation eller opdateringsbesked er behandlet';
+$labels['weeknonone'] = 'aldrig';
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalendere';
 $labels['category'] = 'Kategori';
@@ -44,7 +45,7 @@ $labels['new_event'] = 'Nyt arrangement';
 $labels['edit_event'] = 'Redigér arrangement';
 $labels['edit'] = 'Redigér';
 $labels['save'] = 'Gem';
-$labels['removelist'] = 'Remove from list';
+$labels['removelist'] = 'Fjern fra liste';
 $labels['cancel'] = 'Annullér';
 $labels['select'] = 'Vælg';
 $labels['print'] = 'Udskriv';
@@ -61,7 +62,7 @@ $labels['location'] = 'Placering';
 $labels['url'] = 'URL';
 $labels['date'] = 'Dato';
 $labels['start'] = 'Start';
-$labels['starttime'] = 'Start time';
+$labels['starttime'] = 'Starttidspunkt';
 $labels['end'] = 'Slut';
 $labels['endtime'] = 'Sluttidspunkt';
 $labels['repeat'] = 'Gentag';
@@ -75,6 +76,7 @@ $labels['mystatus'] = 'Min status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bekræftet';
 $labels['status-cancelled'] = 'Annulleret';
+$labels['status-tentative'] = 'Forsøgsvis';
 $labels['priority'] = 'Prioritet';
 $labels['sensitivity'] = 'Privatliv';
 $labels['public'] = 'offentlig';
@@ -82,18 +84,19 @@ $labels['private'] = 'privat';
 $labels['confidential'] = 'fortrolig';
 $labels['links'] = 'Reference';
 $labels['alarms'] = 'Påmindelse';
-$labels['comment'] = 'Comment';
-$labels['created'] = 'Created';
-$labels['changed'] = 'Last Modified';
+$labels['comment'] = 'Kommentar';
+$labels['created'] = 'Oprettet';
+$labels['changed'] = 'Sidst ændret';
 $labels['unknown'] = 'Ukendt';
 $labels['eventoptions'] = 'Tilvalg';
 $labels['generated'] = 'oprettet per';
 $labels['eventhistory'] = 'Historik';
-$labels['removelink'] = 'Remove email reference';
+$labels['removelink'] = 'Fjern email reference';
 $labels['printdescriptions'] = 'Udskriv beskrivelser';
 $labels['parentcalendar'] = 'Indsæt indeni';
 $labels['searchearlierdates'] = '« Søg efter tidligere arrangementer';
 $labels['searchlaterdates'] = 'Søg efter senere arrangementer »';
+$labels['laterevents'] = 'Senere';
 $labels['andnmore'] = '$nr flere...';
 $labels['togglerole'] = 'Klik for at vise eller skjule rolle';
 $labels['createfrommail'] = 'Gem som arrangement';
@@ -105,9 +108,9 @@ $labels['showurl'] = 'Vis kalenderens URL';
 $labels['showurldescription'] = 'Brug følgende adresse for at tilgå din kalender (skrivebeskyttet) fra andre programmer.  Du kan kopiere og indsætet denne i ethvert kalenderprogram, der understøtter iCal-formatet.';
 $labels['caldavurldescription'] = 'Kopiér denne adresse til en <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-klientprogram (eks. Evolution eller Mozilla Thunderbird) for at synkronisere denne kalender komplet med din computer eller mobilenhed.';
 $labels['findcalendars'] = 'Find kalendere ...';
-$labels['searchterms'] = 'Search terms';
+$labels['searchterms'] = 'Søgetermer';
 $labels['calsearchresults'] = 'Tilgængelige kalendere';
-$labels['calendarsubscribe'] = 'List permanently';
+$labels['calendarsubscribe'] = 'List permanent';
 $labels['nocalendarsfound'] = 'Der blev ikke fundet nogen kalender';
 $labels['nrcalendarsfound'] = '$nr kalendere blev fundet';
 $labels['quickview'] = 'Vis kun denne kalender';
@@ -129,7 +132,7 @@ $labels['nextmonth'] = 'Næste måned';
 $labels['weekofyear'] = 'Uge';
 $labels['pastevents'] = 'Tidligere';
 $labels['futureevents'] = 'Fremtid';
-$labels['showalarms'] = 'Show reminders';
+$labels['showalarms'] = 'Vis påmindelser';
 $labels['defaultalarmtype'] = 'Standardindstilling for påmindelse';
 $labels['defaultalarmoffset'] = 'Standardtidspunkt for påmindelse';
 $labels['attendee'] = 'Deltager';
@@ -151,8 +154,6 @@ $labels['availbusy'] = 'Optaget';
 $labels['availunknown'] = 'Ukendt';
 $labels['availtentative'] = 'Forsøgsvis';
 $labels['availoutofoffice'] = 'Ikke på kontoret';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['scheduletime'] = 'Find ledigt tidspunkt';
 $labels['sendinvitations'] = 'Send invitationer';
 $labels['sendnotifications'] = 'Gør deltagere opmærksom på ændringer';
@@ -164,12 +165,11 @@ $labels['nextslot'] = 'Næste blok';
 $labels['suggestedslot'] = 'Foreslået blok';
 $labels['noslotfound'] = 'Kunne ikke finde en ledig tidsblok';
 $labels['invitationsubject'] = 'Du er blevet inviteret til "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
 $labels['invitationattendlinks'] = "Hvis dit e-postprogram ikke understøtter iTip-forespørgsler, så kan du benytte følgende henvisning til enten at acceptere eller afvise denne invitation:\n\$url";
 $labels['eventupdatesubject'] = '"$title" er blevet opdateret';
 $labels['eventupdatesubjectempty'] = 'Et arrangement der vedrører dig er blevet opdateret';
 $labels['eventupdatemailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
-$labels['eventcancelsubject'] = '"$title" er blevet aflyst';
+$labels['eventcancelsubject'] = '"$title" er blevet annulleret';
 $labels['eventcancelmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nDette arrangement er blevet aflyst af \$organizer.\n\nBemærk venligst vedhæftede iCalendard-fil med de opdaterede detaljer om arrangementet.";
 $labels['itipobjectnotfound'] = 'Begivenheden som denne besked henviser til, blev ikke fundet i din kalender.';
 $labels['itipmailbodyaccepted'] = "\$sender har accepteret invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
diff --git a/plugins/calendar/localization/de_CH.inc b/plugins/calendar/localization/de_CH.inc
index 1ae74ef1..d949717e 100644
--- a/plugins/calendar/localization/de_CH.inc
+++ b/plugins/calendar/localization/de_CH.inc
@@ -27,6 +27,7 @@ $labels['afterflagdeleted'] = 'Als gelöscht markieren';
 $labels['aftermoveto'] = 'Verschiebe nach...';
 $labels['itipoptions'] = 'Termineinladungen';
 $labels['afteraction'] = 'Nachdem eine Einladungs- oder Update-Nachricht verarbetet wurde';
+$labels['weeknonone'] = 'nie';
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -75,6 +76,7 @@ $labels['mystatus'] = 'Mein Status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bestätigt';
 $labels['status-cancelled'] = 'Gekündigt';
+$labels['status-tentative'] = 'Mit Vorbehalt';
 $labels['priority'] = 'Priorität';
 $labels['sensitivity'] = 'Sichtbarkeit';
 $labels['public'] = 'öffentlich';
@@ -94,6 +96,7 @@ $labels['printdescriptions'] = 'Beschrieb drucken';
 $labels['parentcalendar'] = 'Erstellen in';
 $labels['searchearlierdates'] = '« Frühere Termine suchen';
 $labels['searchlaterdates'] = 'Spätere Termine suchen »';
+$labels['laterevents'] = 'Später';
 $labels['andnmore'] = '$nr weitere...';
 $labels['togglerole'] = 'Zum Ändern der Rolle klicken';
 $labels['createfrommail'] = 'Als Termin speichern';
@@ -151,8 +154,6 @@ $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
 $labels['availtentative'] = 'Mit Vorbehalt';
 $labels['availoutofoffice'] = 'Abwesend';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
 $labels['scheduletime'] = 'Verfügbarkeit anzeigen';
 $labels['sendinvitations'] = 'Einladungen versenden';
 $labels['sendnotifications'] = 'Teilnehmer über die Änderungen informieren';
@@ -164,7 +165,7 @@ $labels['nextslot'] = 'Nächster Vorschlag';
 $labels['suggestedslot'] = 'Empfohlener Terminplatz';
 $labels['noslotfound'] = 'Es konnten keine freien Zeiten gefunden werden';
 $labels['invitationsubject'] = 'Sie wurden zu "$title" eingeladen';
-$labels['invitationmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$labels['invitationmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\n\$description\n\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['invitationattendlinks'] = "Falls Ihr E-Mail-Programm keine iTip-Anfragen unterstützt, können Sie den folgenden Link verwenden, um den Termin zu bestätigen oder abzulehnen:\n\$url";
 $labels['eventupdatesubject'] = '"$title" wurde aktualisiert';
 $labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
@@ -176,8 +177,8 @@ $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Term
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender hat ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nam: \$date";
-$labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWhen: \$date";
-$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWann: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWann: \$date";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
 $labels['declinedeleteconfirm'] = 'Do you also want to delete this declined event from your calendar?';
 $labels['itipcomment'] = 'Kommentar zur Einladungs/Benachrichtigung';
diff --git a/plugins/calendar/localization/de_DE.inc b/plugins/calendar/localization/de_DE.inc
index fed31790..1981504e 100644
--- a/plugins/calendar/localization/de_DE.inc
+++ b/plugins/calendar/localization/de_DE.inc
@@ -8,6 +8,7 @@
  */
 $labels['default_view'] = 'Standardansicht';
 $labels['time_format'] = 'Zeitformatierung';
+$labels['timeslots'] = 'Zeitfenster pro Stunde';
 $labels['first_day'] = 'Erster Wochentag';
 $labels['first_hour'] = 'Erste angezeigte Stunde';
 $labels['workinghours'] = 'Arbeitszeiten';
@@ -25,7 +26,8 @@ $labels['afterdelete'] = 'Nachricht löschen';
 $labels['afterflagdeleted'] = 'Als gelöscht markieren';
 $labels['aftermoveto'] = 'Verschiebe nach...';
 $labels['itipoptions'] = 'Veranstaltungseinladungen';
-$labels['afteraction'] = 'Nachdem eine Einladungs- oder Update-Nachricht verarbetet wurde';
+$labels['afteraction'] = 'Nachdem eine Einladungs- oder Aktualisierungsnachricht verarbeitet wurde';
+$labels['weeknonone'] = 'nie';
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -57,7 +59,7 @@ $labels['exportrange'] = 'Termine ab';
 $labels['exportattachments'] = 'Mit Anhängen';
 $labels['customdate'] = 'Benutzerdefiniertes Datum';
 $labels['location'] = 'Ort';
-$labels['url'] = 'URL';
+$labels['url'] = 'Internetadresse';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Beginn';
 $labels['starttime'] = 'Startzeit';
@@ -65,7 +67,7 @@ $labels['end'] = 'Ende';
 $labels['endtime'] = 'Endzeit';
 $labels['repeat'] = 'Wiederholung';
 $labels['selectdate'] = 'Datum auswählen';
-$labels['freebusy'] = 'Zeige mich als';
+$labels['freebusy'] = 'Mich anzeigen als';
 $labels['free'] = 'Frei';
 $labels['busy'] = 'Gebucht';
 $labels['outofoffice'] = 'Abwesend';
@@ -74,6 +76,7 @@ $labels['mystatus'] = 'Mein Status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bestätigt';
 $labels['status-cancelled'] = 'Abgesagt';
+$labels['status-tentative'] = 'Mit Vorbehalt';
 $labels['priority'] = 'Priorität';
 $labels['sensitivity'] = 'Sichtbarkeit';
 $labels['public'] = 'öffentlich';
@@ -93,7 +96,8 @@ $labels['printdescriptions'] = 'Beschreibung drucken';
 $labels['parentcalendar'] = 'Erstellen in';
 $labels['searchearlierdates'] = '« Frühere Termine suchen';
 $labels['searchlaterdates'] = 'Spätere Termine suchen »';
-$labels['andnmore'] = '$nr weitere...';
+$labels['laterevents'] = 'Später';
+$labels['andnmore'] = '$nr weitere …';
 $labels['togglerole'] = 'Zum Ändern der Rolle klicken';
 $labels['createfrommail'] = 'Als Termin speichern';
 $labels['importevents'] = 'Termine importieren';
@@ -103,7 +107,7 @@ $labels['nmonthsback'] = '$nr Monate zurück';
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
 $labels['caldavurldescription'] = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-Klienten (z.B. Evolution oder Mozilla Thunderbird) kopieren, um den Kalender in Gänze mit einem mobilen Gerät zu synchronisieren.';
-$labels['findcalendars'] = 'Kalender finden...';
+$labels['findcalendars'] = 'Kalender finden …';
 $labels['searchterms'] = 'Suchbegriffe';
 $labels['calsearchresults'] = 'Verfügbare Kalender';
 $labels['calendarsubscribe'] = 'Permanent anzeigen';
@@ -150,8 +154,6 @@ $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
 $labels['availtentative'] = 'Mit Vorbehalt';
 $labels['availoutofoffice'] = 'Abwesend';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
 $labels['scheduletime'] = 'Verfügbarkeit anzeigen';
 $labels['sendinvitations'] = 'Einladungen versenden';
 $labels['sendnotifications'] = 'Teilnehmer über die Änderungen informieren';
@@ -162,21 +164,21 @@ $labels['prevslot'] = 'Vorheriger Vorschlag';
 $labels['nextslot'] = 'Nächster Vorschlag';
 $labels['suggestedslot'] = 'Empfohlener Slot';
 $labels['noslotfound'] = 'Es konnten keine freien Zeiten gefunden werden';
-$labels['invitationsubject'] = 'Sie wurden zu "$title" eingeladen';
-$labels['invitationmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$labels['invitationsubject'] = 'Sie wurden zu »$title« eingeladen';
+$labels['invitationmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\n\$description\n\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['invitationattendlinks'] = "Falls Ihr E-Mail-Programm keine iTip-Anfragen unterstützt, können Sie den folgenden Link verwenden, um den Termin zu bestätigen oder abzulehnen:\n\$url";
-$labels['eventupdatesubject'] = '"$title" wurde aktualisiert';
+$labels['eventupdatesubject'] = '»$title« wurde aktualisiert';
 $labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
-$labels['eventcancelsubject'] = '"$title" wurde abgesagt';
+$labels['eventcancelsubject'] = '»$title« wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
 $labels['itipobjectnotfound'] = 'Der Termin auf den sich diese Nachricht bezieht, wurde in Ihrem Kalender nicht gefunden.';
 $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nam: \$date";
+$labels['itipmailbodycancel'] = "\$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nWann: \$date";
 $labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWhen: \$date";
-$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWann: \$date";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
 $labels['declinedeleteconfirm'] = 'Soll der abgelehnte Termin zusätzlich aus dem Kalender gelöscht werden?';
 $labels['itipcomment'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
@@ -206,7 +208,7 @@ $labels['deleteobjectconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?'
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
 $labels['deletecalendarconfirmrecursive'] = 'Soll dieser Kalender wirklich mit allen Terminen und Unterkalendern gelöscht werden?';
-$labels['savingdata'] = 'Speichere Daten...';
+$labels['savingdata'] = 'Daten werden gespeichert …';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['operationfailed'] = 'Die Aktion ist fehlgeschlagen.';
 $labels['invalideventdates'] = 'Ungültige Daten eingegeben! Bitte überprüfen Sie die Eingaben.';
@@ -219,8 +221,8 @@ $labels['errorimportingevent'] = 'Fehler beim Importieren';
 $labels['importwarningexists'] = 'Eine Kopie dieses Termins existiert bereits in Ihrem Kalender.';
 $labels['newerversionexists'] = 'Eine neuere Version dieses Termins exisitert bereits! Import abgebrochen.';
 $labels['nowritecalendarfound'] = 'Kein Kalender zum Speichern gefunden';
-$labels['importedsuccessfully'] = 'Der Termin wurde erfolgreich in \'$calendar\' gespeichert';
-$labels['updatedsuccessfully'] = 'Der Termin wurde erfolgreich in \'$calendar\' geändert';
+$labels['importedsuccessfully'] = 'Der Termin wurde erfolgreich in »$calendar« gespeichert';
+$labels['updatedsuccessfully'] = 'Der Termin wurde erfolgreich in »$calendar« geändert';
 $labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
 $labels['itipsendsuccess'] = 'Einladung an Teilnehmer versendet.';
 $labels['itipresponseerror'] = 'Die Antwort auf diese Einladung konnte nicht versendet werden';
@@ -241,12 +243,12 @@ $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
 $labels['birthdays'] = 'Geburtstage';
-$labels['birthdayscalendar'] = 'Geburtstags-Kalender';
-$labels['displaybirthdayscalendar'] = 'Geburtstags-Kalender anzeigen';
+$labels['birthdayscalendar'] = 'Geburtstagskalender';
+$labels['displaybirthdayscalendar'] = 'Geburtstagskalender anzeigen';
 $labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
 $labels['birthdayeventtitle'] = '$names Geburtstag';
 $labels['birthdayage'] = 'Alter $age';
-$labels['objectchangelog'] = 'Änderungshistorie';
+$labels['objectchangelog'] = 'Änderungsverlauf';
 $labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
 $labels['objectnotfound'] = 'Termindaten sind leider nicht vergübar';
 $labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diesen Termin';
diff --git a/plugins/calendar/localization/el.inc b/plugins/calendar/localization/el.inc
new file mode 100644
index 00000000..aa3c1e40
--- /dev/null
+++ b/plugins/calendar/localization/el.inc
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = 'Προεπιλεγμένη προβολή';
+$labels['time_format'] = 'Μορφή ώρας';
+$labels['workinghours'] = 'Ώρες εργασίας';
+$labels['add_category'] = 'Προσθήκη κατηγορίας';
+$labels['remove_category'] = 'Αφαίρεση κατηγορίας';
+$labels['defaultcalendar'] = 'Δημιουργία νέων συμβάντων στο';
+$labels['eventcoloring'] = 'Χρωματισμός συμβάντος';
+$labels['coloringmode0'] = 'Σύμφωνα με το ημερολόγιο';
+$labels['coloringmode1'] = 'Σύμφωνα με την κατηγορία';
+$labels['aftertrash'] = 'Μετακίνηση στα απορρίματα';
+$labels['afterdelete'] = 'Διαγραφή μηνύματος';
+$labels['afterflagdeleted'] = 'Σημείωση ως διεγραμμένου';
+$labels['aftermoveto'] = 'Μεταφορά σε...';
+$labels['itipoptions'] = 'Προσκλήσεις συμβάντος';
+$labels['calendar'] = 'Ημερολόγιο';
+$labels['calendars'] = 'Ημερολόγια';
+$labels['category'] = 'Κατηγορία';
+$labels['categories'] = 'Κατηγορίες';
+$labels['createcalendar'] = 'Δημιουργία νέου ημερολογίου';
+$labels['editcalendar'] = 'Επεξεργασία ιδιοτήτων ημερολογίου';
+$labels['name'] = 'Όνομα';
+$labels['color'] = 'Χρώμα';
+$labels['day'] = 'Ημέρα';
+$labels['week'] = 'Εβδομάδα';
+$labels['month'] = 'Μήνας';
+$labels['new'] = 'Νέο';
+$labels['new_event'] = 'Νέο συμβάν';
+$labels['edit_event'] = 'Επεξεργασία συμβάντος';
+$labels['edit'] = 'Επεξεργασία';
+$labels['save'] = 'Αποθήκευση';
+$labels['removelist'] = 'Αφαίρεση από την λίστα';
+$labels['cancel'] = 'Ακύρωση';
+$labels['select'] = 'Επιλογή';
+$labels['print'] = 'Εκτύπωση';
+$labels['printtitle'] = 'Εκτύπωση ημερολογίων';
+$labels['title'] = 'Περίληψη';
+$labels['description'] = 'Περιγραφή';
+$labels['all-day'] = 'ολοήμερο';
+$labels['export'] = 'Εξαγωγή';
+$labels['exporttitle'] = 'Εξαγωγή σε iCalendar';
+$labels['exportrange'] = 'Συμβάντα από';
+$labels['location'] = 'Τοποθεσία';
+$labels['url'] = 'URL';
+$labels['date'] = 'Ημερομηνία';
+$labels['start'] = 'Έναρξη';
+$labels['starttime'] = 'Ώρα έναρξης';
+$labels['end'] = 'Λήξη';
+$labels['endtime'] = 'Ώρα λήξης';
+$labels['repeat'] = 'Επανάληψη';
+$labels['selectdate'] = 'Επιλογή ημερομηνίας';
+$labels['busy'] = 'Απασχολημένος';
+$labels['outofoffice'] = 'Εκτός γραφείου';
+$labels['status'] = 'Κατάσταση';
+$labels['sensitivity'] = 'Ιδιωτικότητα';
+$labels['comment'] = 'Σχόλιο';
+$labels['created'] = 'Δημιουργήθηκε';
+$labels['changed'] = 'Τελευταία τροποποίηση';
+$labels['eventhistory'] = 'Ιστορικό';
+$labels['createfrommail'] = 'Αποθήκευση συμβάντος ως';
+$labels['importevents'] = 'Εισαγωγή συμβάντων';
+$labels['importrange'] = 'Συμβάντα από';
+$labels['onemonthback'] = '1 μήνα πριν';
+$labels['nmonthsback'] = '$nr μήνες πριν';
+$labels['findcalendars'] = 'Εύρεση ημερολογίων...';
+$labels['searchterms'] = 'Όροι αναζήτησης';
+$labels['calsearchresults'] = 'Διαθέσιμα ημερολόγια';
+$labels['until'] = 'μέχρι';
+$labels['today'] = 'Σήμερα';
+$labels['tomorrow'] = 'Αύριο';
+$labels['thisweek'] = 'Αυτή την εβδομάδα';
+$labels['nextweek'] = 'Την επόμενη εβδομάδα';
+$labels['prevweek'] = 'Την προηγούμενη εβδομάδα';
+$labels['thismonth'] = 'Αυτό τον μήνα';
+$labels['nextmonth'] = 'Τον επόμενο μήνα';
+$labels['weekofyear'] = 'Εβδομάδα';
+$labels['role'] = 'Ρόλος';
+$labels['availability'] = 'Διαθ.';
+$labels['confirmstate'] = 'Κατάσταση';
+$labels['addattendee'] = 'Προσθήκη συμμετεχόντων';
+$labels['roleorganizer'] = 'Οργανωτής';
+$labels['cutypegroup'] = 'Ομάδα';
+$labels['availbusy'] = 'Απασχολημένος';
+$labels['availoutofoffice'] = 'Εκτός γραφείου';
+$labels['tabsummary'] = 'Περίληψη';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+$labels['objectchangelog'] = 'Αλλαγή ιστορικού';
+?>
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index 2a5d2359..24ed75ae 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -32,12 +32,17 @@ $labels['afterflagdeleted'] = 'Flag as deleted';
 $labels['aftermoveto'] = 'Move to...';
 $labels['itipoptions'] = 'Event Invitations';
 $labels['afteraction'] = 'After an invitation or update message is processed';
+$labels['showweekno'] = 'Display week numbers';
+$labels['weeknonone'] = 'never';
+$labels['weeknodatepicker'] = 'in datepicker only';
+$labels['weeknoall'] = 'in datepicker and calendar view';
 
 // calendar
 $labels['calendar'] = 'Calendar';
 $labels['calendars'] = 'Calendars';
 $labels['category'] = 'Category';
 $labels['categories'] = 'Categories';
+$labels['addcalendar'] = 'Add calendar';
 $labels['createcalendar'] = 'Create new calendar';
 $labels['editcalendar'] = 'Edit calendar properties';
 $labels['name'] = 'Name';
@@ -82,6 +87,7 @@ $labels['mystatus'] = 'My status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Confirmed';
 $labels['status-cancelled'] = 'Cancelled';
+$labels['status-tentative'] = 'Tentative';
 $labels['priority'] = 'Priority';
 $labels['sensitivity'] = 'Privacy';
 $labels['public'] = 'public';
@@ -101,6 +107,8 @@ $labels['printdescriptions'] = 'Print descriptions';
 $labels['parentcalendar'] = 'Insert inside';
 $labels['searchearlierdates'] = '« Search for earlier events';
 $labels['searchlaterdates'] = 'Search for later events »';
+$labels['earlierevents'] = 'Earlier';
+$labels['laterevents'] = 'Later';
 $labels['andnmore'] = '$nr more...';
 $labels['togglerole'] = 'Click to toggle role';
 $labels['createfrommail'] = 'Save as event';
@@ -111,8 +119,11 @@ $labels['nmonthsback'] = '$nr months back';
 $labels['showurl'] = 'Show calendar URL';
 $labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
 $labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
+$labels['showfburl'] = 'Show free-busy URL';
+$labels['fburldescription'] = 'Use the following address to access Free-Busy information from other applications. You can copy and paste this into any calendar software that supports free-busy information in iCal format. No authentication is required for this URL.';
 $labels['findcalendars'] = 'Find calendars...';
 $labels['searchterms'] = 'Search terms';
+$labels['findevents'] = 'Find events';
 $labels['calsearchresults'] = 'Available Calendars';
 $labels['calendarsubscribe'] = 'List permanently';
 $labels['nocalendarsfound'] = 'No calendars found';
@@ -122,6 +133,8 @@ $labels['invitationspending'] = 'Pending invitations';
 $labels['invitationsdeclined'] = 'Declined invitations';
 $labels['changepartstat'] = 'Change participant status';
 $labels['rsvpcomment'] = 'Invitation text';
+$labels['eventstartsync'] = 'Move the event start date to the first occurrence';
+$labels['weekshort'] = 'Wk';
 
 // agenda view
 $labels['listrange'] = 'Range to display:';
@@ -164,8 +177,6 @@ $labels['availbusy'] = 'Busy';
 $labels['availunknown'] = 'Unknown';
 $labels['availtentative'] = 'Tentative';
 $labels['availoutofoffice'] = 'Out of Office';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['scheduletime'] = 'Find availability';
 $labels['sendinvitations'] = 'Send invitations';
 $labels['sendnotifications'] = 'Notify participants about modifications';
@@ -177,12 +188,12 @@ $labels['nextslot'] = 'Next Slot';
 $labels['suggestedslot'] = 'Suggested Slot';
 $labels['noslotfound'] = 'Unable to find a free time slot';
 $labels['invitationsubject'] = 'You\'ve been invited to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
+$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\n\$description\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
 $labels['invitationattendlinks'] = "In case your email client doesn't support iTip requests you can use the following link to either accept or decline this invitation:\n\$url";
 $labels['eventupdatesubject'] = '"$title" has been updated';
 $labels['eventupdatesubjectempty'] = 'An event that concerns you has been updated';
 $labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with the updated event details which you can import to your calendar application.";
-$labels['eventcancelsubject'] = '"$title" has been canceled';
+$labels['eventcancelsubject'] = '"$title" has been cancelled';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nThe event has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated event details.";
 
 // invitation handling (overrides labels from libcalendaring)
@@ -208,6 +219,7 @@ $labels['savetocalendar'] = 'Save to calendar';
 $labels['openpreview'] = 'Check Calendar';
 $labels['noearlierevents'] = 'No earlier events';
 $labels['nolaterevents'] = 'No later events';
+$labels['legend'] = 'Legend';
 
 // resources
 $labels['resource'] = 'Resource';
@@ -215,6 +227,7 @@ $labels['addresource'] = 'Book resource';
 $labels['findresources'] = 'Find resources';
 $labels['resourcedetails'] = 'Details';
 $labels['resourceavailability'] = 'Availability';
+$labels['resourceprops'] = 'Resource properties';
 $labels['resourceowner'] = 'Owner';
 $labels['resourceadded'] = 'The resource was added to your event';
 
@@ -247,6 +260,7 @@ $labels['nowritecalendarfound'] = 'No calendar found to save the event';
 $labels['importedsuccessfully'] = 'The event was successfully added to \'$calendar\'';
 $labels['updatedsuccessfully'] = 'The event was successfully updated in \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['errorunknownattendee'] = 'Failed to find the participant information.';
 $labels['itipsendsuccess'] = 'Invitation sent to participants.';
 $labels['itipresponseerror'] = 'Failed to send the response to this event invitation';
 $labels['itipinvalidrequest'] = 'This invitation is no longer valid';
@@ -256,6 +270,7 @@ $labels['importsuccess'] = 'Successfully imported $nr events';
 $labels['importnone'] = 'No events found to be imported';
 $labels['importerror'] = 'An error occured while importing';
 $labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
+$labels['importtext'] = 'You can upload events in <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> format (.ics).';
 
 $labels['changeeventconfirm'] = 'Change event';
 $labels['removeeventconfirm'] = 'Delete event';
@@ -266,6 +281,7 @@ $labels['currentevent'] = 'Current';
 $labels['futurevents'] = 'Future';
 $labels['allevents'] = 'All';
 $labels['saveasnew'] = 'Save as new';
+$labels['recurrenceerror'] = 'Unable to resolve recurrence rule for specified start date.';
 
 // birthdays calendar
 $labels['birthdays'] = 'Birthdays';
@@ -285,7 +301,6 @@ $labels['revisionrestoreconfirm'] = 'Do you really want to restore revision $rev
 $labels['objectrestoresuccess'] = 'Revision $rev successfully restored';
 $labels['objectrestoreerror'] = 'Failed to restore the old revision';
 
-
 // (hidden) titles and labels for accessibility annotations
 $labels['arialabelminical'] = 'Calendar date selection';
 $labels['arialabelcalendarview'] = 'Calendar view';
@@ -293,9 +308,11 @@ $labels['arialabelsearchform'] = 'Event search form';
 $labels['arialabelquicksearchbox'] = 'Event search input';
 $labels['arialabelcalsearchform'] = 'Calendars search form';
 $labels['calendaractions'] = 'Calendar actions';
+$labels['calendarprops'] = 'Calendar properties';
 $labels['arialabeleventattendees'] = 'Event participants list';
 $labels['arialabeleventresources'] = 'Event resources list';
 $labels['arialabelresourcesearchform'] = 'Resources search form';
 $labels['arialabelresourceselection'] = 'Available resources';
+$labels['arialabeleventform'] = 'Event editing form';
 
 ?>
diff --git a/plugins/calendar/localization/es_AR.inc b/plugins/calendar/localization/es_AR.inc
index fe189939..6e3442d4 100644
--- a/plugins/calendar/localization/es_AR.inc
+++ b/plugins/calendar/localization/es_AR.inc
@@ -27,10 +27,12 @@ $labels['afterflagdeleted'] = 'Marcar como eliminado';
 $labels['aftermoveto'] = 'Mover a...';
 $labels['itipoptions'] = 'Invitaciones del evento';
 $labels['afteraction'] = 'Luego que una invitación o actualización de mensaje es procesado';
+$labels['weeknonone'] = 'nunca';
 $labels['calendar'] = 'Calendario';
 $labels['calendars'] = 'Calendarios';
 $labels['category'] = 'Categoría';
 $labels['categories'] = 'Categorías';
+$labels['addcalendar'] = 'Agregar calendario';
 $labels['createcalendar'] = 'Crear nuevo calendario';
 $labels['editcalendar'] = 'Editar propiedades del calendario';
 $labels['name'] = 'Nombre';
@@ -75,11 +77,13 @@ $labels['mystatus'] = 'Mi estado';
 $labels['status'] = 'Estado';
 $labels['status-confirmed'] = 'Confirmado';
 $labels['status-cancelled'] = 'Cancelado';
+$labels['status-tentative'] = 'Tentativo';
 $labels['priority'] = 'Prioridad';
 $labels['sensitivity'] = 'Privacidad';
 $labels['public'] = 'público';
 $labels['private'] = 'privado';
 $labels['confidential'] = 'confidencial';
+$labels['links'] = 'Referencia';
 $labels['alarms'] = 'Recordatorio';
 $labels['comment'] = 'Comentario';
 $labels['created'] = 'Creado';
@@ -88,10 +92,13 @@ $labels['unknown'] = 'Desconocido';
 $labels['eventoptions'] = 'Opciones';
 $labels['generated'] = 'generado en';
 $labels['eventhistory'] = 'Historial';
+$labels['removelink'] = 'Eliminar referencia de correo';
 $labels['printdescriptions'] = 'Imprimir descripciones';
 $labels['parentcalendar'] = 'Insertar dentro';
 $labels['searchearlierdates'] = '« Buscar eventos anteriores';
 $labels['searchlaterdates'] = 'Buscar eventos posteriores »';
+$labels['earlierevents'] = 'Anteriormente';
+$labels['laterevents'] = 'Luego';
 $labels['andnmore'] = '$nr más...';
 $labels['togglerole'] = 'Click para cambiar rol';
 $labels['createfrommail'] = 'Guardar como evento';
@@ -102,8 +109,11 @@ $labels['nmonthsback'] = '$nr meses atrás';
 $labels['showurl'] = 'Mostrar URL del calendario';
 $labels['showurldescription'] = 'Use la siguiente direccion para acceder (sólo lectura) a su calendario desde otras aplicaciones. Puede copiar y pegar esto dentro de cualquier software de calendario que soporte el formato iCal.';
 $labels['caldavurldescription'] = 'Copie esta direccion a su aplicación cliente <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (por ejemplo, Evolution o Mozilla Thunderbird) para sincronizar completamente este calendario específico con su ordenador o dispositivo móvil.';
+$labels['showfburl'] = 'Mostrar URL libre-ocupado';
+$labels['fburldescription'] = 'Use la siguiente dirección para acceder a la información Libre-Ocupado desde otras aplicaciones. Puede copiar y pegar esto dentro de cualquier software que soporte información libre-ocupado en el formato iCal. No se requiere autenticación para esta URL.';
 $labels['findcalendars'] = 'Encontrar calendarios...';
 $labels['searchterms'] = 'Buscar términos';
+$labels['findevents'] = 'Encontrar eventos';
 $labels['calsearchresults'] = 'Calendarios disponibles';
 $labels['calendarsubscribe'] = 'Listar permanentemente';
 $labels['nocalendarsfound'] = 'No se encontraron calendarios';
@@ -113,6 +123,7 @@ $labels['invitationspending'] = 'Invitaciones pendientes';
 $labels['invitationsdeclined'] = 'Invitaciones rechazadas';
 $labels['changepartstat'] = 'Cambiar el estado del participante';
 $labels['rsvpcomment'] = 'Texto de invitación';
+$labels['eventstartsync'] = 'Mover la fecha de inicio del evento a la primera ocurrencia';
 $labels['listrange'] = 'Rango a mostrar:';
 $labels['listsections'] = 'Dividir en:';
 $labels['smartsections'] = 'Secciones inteligentes';
@@ -149,8 +160,6 @@ $labels['availbusy'] = 'Ocupado';
 $labels['availunknown'] = 'Desconocido';
 $labels['availtentative'] = 'Tentativo';
 $labels['availoutofoffice'] = 'Fuera de la oficina';
-$labels['delegatedto'] = 'Delegado a:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['scheduletime'] = 'Buscar disponibilidad';
 $labels['sendinvitations'] = 'Enviar invitaciones';
 $labels['sendnotifications'] = 'Notificar a los participantes sobre las modificaciones';
@@ -162,18 +171,20 @@ $labels['nextslot'] = 'Espacio siguiente';
 $labels['suggestedslot'] = 'Espacio sugerido';
 $labels['noslotfound'] = 'Imposible encontrar un espacio libre';
 $labels['invitationsubject'] = 'Ha sido invitado a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees\n\nEncontrará adjunto un archivo iCalendar con todos los detalles del evento, el cual puede importar a su aplicación de calendario.";
+$labels['invitationmailbody'] = "*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees\n\n\$description\n\nEncontrará adjunto un archivo iCalendar con todos los detalles del evento, el cual puede importar a su aplicación de calendario.";
 $labels['invitationattendlinks'] = "En caso que su cliente de correo electrónico no soporte peticiones iTip puede usar el siguiente link para aceptar o declinar esta invitación:\n\$url";
 $labels['eventupdatesubject'] = '"$title" ha sido actualizado';
 $labels['eventupdatesubjectempty'] = 'Un evento que le interesa ha sido actualizado';
 $labels['eventupdatemailbody'] = "*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees\n\nEncontrará adjunto un archivo iCalendar con todos los detalles del evento, el cual puede importar a su aplicación de calendario.";
-$labels['eventcancelsubject'] = '"$title" has been canceled';
+$labels['eventcancelsubject'] = '"$title" ha sido cancelado';
 $labels['eventcancelmailbody'] = "*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees\n\nEl evento ha sido cancelado por \$organizer.\n\nEncontrará adjunto un archivo iCalendar con todos los detalles actualizados del evento.";
 $labels['itipobjectnotfound'] = 'El evento referido por este mensaje no fue encontrado en su calendario.';
 $labels['itipmailbodyaccepted'] = "\$sender ha aceptado la invitación al siguiente evento:\n\n*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender ha tentativamente aceptado la invitación al siguiente evento:\n\n*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender ha rechazado la invitación al siguiente evento:\n\n*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender ha rechazado tu participación en el siguiente evento:\n\n*\$title*\n\nCuándo:\$date";
+$labels['itipmailbodydelegated'] = "\$sender ha delegado la invitación en el siguiente evento:\n\n*\$title*\n\nCuándo: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ha delegado la participación en el siguiente evento a usted:\n\n*\$title*\n\nCuándo: \$date";
 $labels['itipdeclineevent'] = '¿Quiere rechazar la invitación a este evento?';
 $labels['declinedeleteconfirm'] = '¿Quiere también eliminar este evento rechazado de su calendario?';
 $labels['itipcomment'] = 'Comentario de la invitación/notificación';
@@ -186,11 +197,13 @@ $labels['savetocalendar'] = 'Guardar en el calendario';
 $labels['openpreview'] = 'Comprobar Calendario';
 $labels['noearlierevents'] = 'No hay eventos anteriores';
 $labels['nolaterevents'] = 'No hay eventos posteriores';
+$labels['legend'] = 'Leyenda';
 $labels['resource'] = 'Recurso';
 $labels['addresource'] = 'Agendar recurso';
 $labels['findresources'] = 'Encontrar recursos';
 $labels['resourcedetails'] = 'Detalles';
 $labels['resourceavailability'] = 'Disponibilidad';
+$labels['resourceprops'] = 'Propiedades del recurso';
 $labels['resourceowner'] = 'Propietario';
 $labels['resourceadded'] = 'El recurso fue agregado a su evento';
 $labels['tabsummary'] = 'Sumario';
@@ -219,6 +232,7 @@ $labels['nowritecalendarfound'] = 'No hay calendarios para guardar el evento.';
 $labels['importedsuccessfully'] = 'El evento fue guardado en \'$calendar\' exitosamente';
 $labels['updatedsuccessfully'] = 'El evento fue actualizado exitosamente en \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Se actualizaron los estados de los participantes exitosamente';
+$labels['errorunknownattendee'] = 'Fallo al encontrar la información de los participantes.';
 $labels['itipsendsuccess'] = 'Invitaciones enviadas a los participantes.';
 $labels['itipresponseerror'] = 'Fallo enviando la respuesta a la invitación de este evento';
 $labels['itipinvalidrequest'] = 'Esta invitación no es válida';
@@ -228,14 +242,17 @@ $labels['importsuccess'] = 'Importados $nr eventos exitosamente';
 $labels['importnone'] = 'No se importaron eventos';
 $labels['importerror'] = 'Fallo al importar';
 $labels['aclnorights'] = 'No tiene permisos de administrador en este calendario.';
+$labels['importtext'] = 'Puede subir eventos en formato <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> (.ics)';
 $labels['changeeventconfirm'] = 'Cambiar evento';
 $labels['removeeventconfirm'] = 'Eliminar evento';
 $labels['changerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea editar solo el evento actual, este y las ocurrencias futuras, todas las ocurrencias o guardarlo como un evento nuevo?';
 $labels['removerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea eliminar solo el evento actual, este y las ocurrencias futuras o todas las ocurrencias del evento?';
+$labels['removerecurringallonly'] = 'Este es un evento recurrente. Como participante, usted solamente puede eliminar el evento completo con todas las ocurrencias.';
 $labels['currentevent'] = 'Actual';
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Todos';
 $labels['saveasnew'] = 'Guardar como nuevo';
+$labels['recurrenceerror'] = 'Imposible de resolver la regla de recurrencia para la fecha de inicio especificada.';
 $labels['birthdays'] = 'Cumpleaños';
 $labels['birthdayscalendar'] = 'Calendario de cumpleaños';
 $labels['displaybirthdayscalendar'] = 'Mostrar calendario de cumpleaños';
@@ -243,18 +260,23 @@ $labels['birthdayscalendarsources'] = 'De estas libretas de direcciones';
 $labels['birthdayeventtitle'] = 'Cumpleaños de $name';
 $labels['birthdayage'] = 'Edad $age';
 $labels['objectchangelog'] = 'Cambiar Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
 $labels['objectnotfound'] = 'Fallo al cargar datos del evento';
 $labels['objectchangelognotavailable'] = 'Cambiar historial no esta disponible para este evento';
 $labels['objectdiffnotavailable'] = 'No es posible comparar las revisiones seleccionadas';
 $labels['revisionrestoreconfirm'] = 'Confirme que quiere recuperar la revisión $rev de este evento. Esta acción reemplazará el evento actual con la versión anterior.';
+$labels['objectrestoresuccess'] = 'Revisión $rev recuperada exitosamente';
+$labels['objectrestoreerror'] = 'Fallo al restaurar el evento anterior';
 $labels['arialabelminical'] = 'Selección de fecha del calendario';
 $labels['arialabelcalendarview'] = 'Vista del calendario';
 $labels['arialabelsearchform'] = 'Formulario de búsqueda de evento';
 $labels['arialabelquicksearchbox'] = 'Entrada de búsqueda de evento';
 $labels['arialabelcalsearchform'] = 'Formulario de búsqueda de calendario';
 $labels['calendaractions'] = 'Acciones del calendario';
+$labels['calendarprops'] = 'Propiedades del calendario';
 $labels['arialabeleventattendees'] = 'Lista de participantes del evento';
 $labels['arialabeleventresources'] = 'Lista de recursos del evento';
 $labels['arialabelresourcesearchform'] = 'Formulario de búsqueda de recursos';
 $labels['arialabelresourceselection'] = 'Recursos disponibles';
+$labels['arialabeleventform'] = 'Formulario de edición de evento';
 ?>
diff --git a/plugins/calendar/localization/es_ES.inc b/plugins/calendar/localization/es_ES.inc
index be71b21a..22b417f3 100644
--- a/plugins/calendar/localization/es_ES.inc
+++ b/plugins/calendar/localization/es_ES.inc
@@ -6,19 +6,263 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
  */
+$labels['default_view'] = 'Vista predeterminada';
+$labels['time_format'] = 'Formato de tiempo';
+$labels['timeslots'] = 'Los intervalos de tiempo por hora';
+$labels['first_day'] = 'Primer día de la semana';
+$labels['first_hour'] = 'Primera hora para mostrar';
+$labels['workinghours'] = 'Horas laborales';
+$labels['add_category'] = 'Añadir categoría';
+$labels['remove_category'] = 'Borrar la categoría';
+$labels['defaultcalendar'] = 'Crear nuevos eventos en';
+$labels['eventcoloring'] = 'Evento para colorear';
+$labels['coloringmode0'] = 'De acuerdo con el calendario';
+$labels['coloringmode1'] = 'De acuerdo con la categoría';
+$labels['coloringmode2'] = 'Calendario para el esquema, la categoría de contenido';
+$labels['coloringmode3'] = 'Calendario para el esquema, la categoría de contenido';
+$labels['afternothing'] = 'No hacer nada';
+$labels['aftertrash'] = 'Mover a la papelera';
+$labels['afterdelete'] = 'Eliminar el mensaje';
+$labels['afterflagdeleted'] = 'Marcar como eliminado';
+$labels['aftermoveto'] = 'Mover a...';
+$labels['itipoptions'] = 'Invitaciones para el evento';
+$labels['afteraction'] = 'Se procesa después de un mensaje de invitación o actualización';
+$labels['weeknonone'] = 'never';
+$labels['calendar'] = 'Calendario';
 $labels['calendars'] = 'Calendarios';
+$labels['category'] = 'Categoría';
+$labels['categories'] = 'Categorías';
+$labels['createcalendar'] = 'Crear nuevo calendario';
+$labels['editcalendar'] = 'Editar propiedades del calendario';
 $labels['name'] = 'Nombre';
+$labels['color'] = 'Color';
+$labels['day'] = 'Día';
+$labels['week'] = 'Semana';
+$labels['month'] = 'Mes';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Nuevo';
+$labels['new_event'] = 'Nuevo evento';
+$labels['edit_event'] = 'Editar evento';
 $labels['edit'] = 'Editar';
 $labels['save'] = 'Guardar';
+$labels['removelist'] = 'Borrar de la lista';
 $labels['cancel'] = 'Cancelar';
+$labels['select'] = 'Seleccionar';
+$labels['print'] = 'Imprimir';
+$labels['printtitle'] = 'Imprimir calendarios';
+$labels['title'] = 'Resumen';
+$labels['description'] = 'Descripción';
+$labels['all-day'] = 'Todo el día';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar a iCalendar';
+$labels['exportrange'] = 'Eventos de';
+$labels['exportattachments'] = 'con los adjuntos';
+$labels['customdate'] = 'Fecha personalizada';
+$labels['location'] = 'Ubicación';
+$labels['url'] = 'URL';
+$labels['date'] = 'Fecha';
+$labels['start'] = 'Inicio';
+$labels['starttime'] = 'Tiempo de inicio';
+$labels['end'] = 'Fin';
+$labels['endtime'] = 'Hora de finalización';
+$labels['repeat'] = 'Repetir';
+$labels['selectdate'] = 'Seleccione la fecha';
+$labels['freebusy'] = 'Mostrarme como';
+$labels['free'] = 'Disponible';
+$labels['busy'] = 'Ocupado';
+$labels['outofoffice'] = 'Fuera de la oficina';
+$labels['tentative'] = 'Provisional';
+$labels['mystatus'] = 'Mi estado';
+$labels['status'] = 'Estado';
+$labels['status-confirmed'] = 'Confirmado';
+$labels['status-cancelled'] = 'Cancelado';
+$labels['status-tentative'] = 'Provisional';
+$labels['priority'] = 'Prioridad';
+$labels['sensitivity'] = 'Privacidad';
+$labels['public'] = 'Pública';
+$labels['private'] = 'Privada';
+$labels['confidential'] = 'Confidencial';
+$labels['links'] = 'Referencia';
+$labels['alarms'] = 'Recordatorio';
 $labels['comment'] = 'Comentario';
+$labels['created'] = 'Creado';
+$labels['changed'] = 'Última modificación';
+$labels['unknown'] = 'Desconocido';
 $labels['eventoptions'] = 'Opciones';
+$labels['generated'] = 'Creado a las';
+$labels['eventhistory'] = 'Historial';
+$labels['removelink'] = 'Eliminar la referencia de correo electrónico';
+$labels['printdescriptions'] = 'Imprimir descripción ';
+$labels['parentcalendar'] = 'Inserte en el interior';
+$labels['searchearlierdates'] = '« Búsqueda de eventos anteriores';
+$labels['searchlaterdates'] = 'Búsqueda de eventos posteriores  »';
+$labels['laterevents'] = 'Luego';
+$labels['andnmore'] = '$nr más...';
+$labels['togglerole'] = 'Haga clic para cambiar el rol';
+$labels['createfrommail'] = 'Guardar como evento';
+$labels['importevents'] = 'Importar eventos';
+$labels['importrange'] = 'Eventos de';
+$labels['onemonthback'] = '1 mes atrás';
+$labels['nmonthsback'] = '$nr meses atrás';
+$labels['showurl'] = 'Mostrar URL del calendario';
+$labels['showurldescription'] = 'Usar la siguiente dirección para acceder (sólo lectura) en su calendario desde otras aplicaciones. Puede copiar y pegar esto en cualquier software de calendario que admita el formato iCal.';
+$labels['caldavurldescription'] = 'Copie esta dirección en un <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> cliente (Evolution o Mozilla Thunderbird) para sincronizar esta tarea con su ordenador o celular.';
+$labels['findcalendars'] = 'Buscar calendarios ...';
+$labels['searchterms'] = 'Buscar términos';
+$labels['calsearchresults'] = 'Calendarios disponibles';
+$labels['calendarsubscribe'] = 'Lista Permanente';
+$labels['nocalendarsfound'] = 'No se han encontrado calendarios';
+$labels['nrcalendarsfound'] = '$nr calendarios encontrados';
+$labels['quickview'] = 'Ver solo este calendario';
+$labels['invitationspending'] = 'Invitaciones pendientes';
+$labels['invitationsdeclined'] = 'Invitaciones rechazada';
+$labels['changepartstat'] = 'Cambiar el estado del participante';
+$labels['rsvpcomment'] = 'Texto de la invitación';
+$labels['listrange'] = 'Rango de visualización:';
+$labels['listsections'] = 'Dividir en:';
+$labels['smartsections'] = 'Secciones inteligentes';
+$labels['until'] = 'hasta';
+$labels['today'] = 'Hoy';
+$labels['tomorrow'] = 'Mañana';
+$labels['thisweek'] = 'Esta semana';
+$labels['nextweek'] = 'Próxima semana';
+$labels['prevweek'] = 'Semana pasada';
+$labels['thismonth'] = 'Este mes';
+$labels['nextmonth'] = 'Próximo mes';
+$labels['weekofyear'] = 'Semana';
+$labels['pastevents'] = 'Pasado';
+$labels['futureevents'] = 'Futuro';
+$labels['showalarms'] = 'Mostrar recordatorios';
+$labels['defaultalarmtype'] = 'Configuración predeterminada del recordatorio';
+$labels['defaultalarmoffset'] = 'Tiempo de aviso predeterminado';
+$labels['attendee'] = 'Participante';
+$labels['role'] = 'Rol';
+$labels['availability'] = 'Disponible';
+$labels['confirmstate'] = 'Estado';
+$labels['addattendee'] = 'Añada participante';
+$labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Requerido';
 $labels['roleoptional'] = 'Opcional';
+$labels['rolechair'] = 'Silla';
+$labels['rolenonparticipant'] = 'Ausente';
+$labels['cutypeindividual'] = 'Individual';
 $labels['cutypegroup'] = 'Grupo';
 $labels['cutyperesource'] = 'Recurso';
+$labels['cutyperoom'] = 'Habitación';
+$labels['availfree'] = 'Disponible';
+$labels['availbusy'] = 'Ocupado';
+$labels['availunknown'] = 'Desconocido';
+$labels['availtentative'] = 'Provisional';
+$labels['availoutofoffice'] = 'Fuera de la oficina';
+$labels['scheduletime'] = 'Buscar disponibilidad';
+$labels['sendinvitations'] = 'Enviar invitaciones';
+$labels['sendnotifications'] = 'Notificar a los participantes acerca de las modificaciones';
+$labels['sendcancellation'] = 'Notificar a los participantes sobre la cancelación de eventos';
+$labels['onlyworkinghours'] = 'Encuentra disponibilidad dentro de mis horas de trabajo';
+$labels['reqallattendees'] = 'Requeridos/todos los participantes';
+$labels['prevslot'] = 'Ranura anterior';
+$labels['nextslot'] = 'Siguiente ranura';
+$labels['suggestedslot'] = 'Ranura sugerida';
+$labels['noslotfound'] = 'Incapaz de encontrar un intervalo de tiempo libre';
+$labels['invitationsubject'] = 'Usted  sido invitado a "$title"';
+$labels['invitationattendlinks'] = "En caso de que su cliente de correo electrónico no admite solicitudes iTIP que puede utilizar el siguiente enlace para aceptar o rechazar esta invitación:\n\$url";
+$labels['eventupdatesubject'] = '"$title" Ha sido actualizado';
+$labels['eventupdatesubjectempty'] = 'Un evento que le concierne ha sido actualizado';
+$labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nSe adjunta un archivo iCalendar con los detalles del evento actualizados que se puede importar a la aplicación de calendario.";
+$labels['eventcancelsubject'] = 'Se ha cancelado "$título"';
+$labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nEl evento ha sido cancelado por\$organizer.\n\nSe adjunta un archivo iCalendar con los detalles del evento actualizados.";
+$labels['itipobjectnotfound'] = 'El evento referido por este mensaje no se encontró en su calendario.';
+$labels['itipmailbodyaccepted'] = "\$sender ha aceptado la invitación al evento siguiente:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender ha aceptado provisionalmente la invitación al evento siguiente:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender ha declinado la invitación al evento siguiente:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender ha rechazado su participación en el evento siguiente:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegated'] = "\$sender ha delegado la participación en el evento siguiente:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ha delegado la participación en el siguiente evento a usted:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipdeclineevent'] = '¿Quieres rechazar la invitación a este evento?';
+$labels['declinedeleteconfirm'] = '¿Usted también desea eliminar este declinado evento del calendario?';
+$labels['itipcomment'] = 'Añadir comentarios a la Invitación/notificación';
+$labels['itipcommenttitle'] = 'Este comentario se adjunta al mensaje de invitación/notificación enviada a los participantes';
+$labels['notanattendee'] = 'Usted no está en la lista como un asistente de este evento';
+$labels['eventcancelled'] = 'El evento ha sido cancelado';
+$labels['saveincalendar'] = 'guardar en';
+$labels['updatemycopy'] = 'actualizar en mi calendario';
+$labels['savetocalendar'] = 'guardar en calendario';
+$labels['openpreview'] = 'Revisar en calendario';
+$labels['noearlierevents'] = 'No hay eventos anteriores';
+$labels['nolaterevents'] = 'No hay eventos posteriores';
 $labels['resource'] = 'Recurso';
+$labels['addresource'] = 'Reservar recursos';
+$labels['findresources'] = 'Encontrar recursos';
 $labels['resourcedetails'] = 'Detalles';
+$labels['resourceavailability'] = 'Disponibilidad';
+$labels['resourceowner'] = 'Propietario';
+$labels['resourceadded'] = 'Se ha añadido un recurso a su evento';
+$labels['tabsummary'] = 'Sumario';
+$labels['tabrecurrence'] = 'Recurrencia ';
+$labels['tabattendees'] = 'Participantes';
 $labels['tabresources'] = 'Recursos';
+$labels['tabattachments'] = 'Adjuntos';
+$labels['tabsharing'] = 'Compartir';
+$labels['deleteobjectconfirm'] = '¿Esta seguro de eliminar  este evento?';
+$labels['deleteventconfirm'] = '¿Esta seguro de eliminar este evento?';
+$labels['deletecalendarconfirm'] = '¿Esta seguro de eliminar este calendario con todos sus eventos?';
+$labels['deletecalendarconfirmrecursive'] = '¿Esta seguro de eliminar este calendario con todos sus eventos y subcalendarios?';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['errorsaving'] = 'Error al guardar cambios';
+$labels['operationfailed'] = 'Error en la operación solicitada';
+$labels['invalideventdates'] = 'Se han introducido fechas erróneas; por favor, revise su entrada';
+$labels['invalidcalendarproperties'] = 'Propiedades de portátiles erróneas; establezca un nombre válido.';
+$labels['searchnoresults'] = 'No se han encontrado eventos en los calendarios seleccionados.';
+$labels['successremoval'] = 'El evento se ha eliminado correctamente.';
+$labels['successrestore'] = 'El evento se ha restaurado correctamente.';
+$labels['errornotifying'] = 'Error al enviar notificaciones a los participantes del evento';
+$labels['errorimportingevent'] = 'Error al importar el evento';
+$labels['importwarningexists'] = 'Ya existe una copia de este evento en su calendario.';
+$labels['newerversionexists'] = 'Ya existe una versión más nueva de este evento. Abortado.';
+$labels['nowritecalendarfound'] = 'No se ha encontrado ningún calendario para guardar el evento.';
+$labels['importedsuccessfully'] = 'El evento se agregó correctamente a \'$calendar\'';
+$labels['updatedsuccessfully'] = 'El evento se actualizó correctamente en \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Se ha actualizado correctamente el estado del participante';
+$labels['itipsendsuccess'] = 'Invitación enviada a los participantes.';
+$labels['itipresponseerror'] = 'Error al enviar la respuesta a esta invitación de evento';
+$labels['itipinvalidrequest'] = 'Esta invitación ya no es válida';
+$labels['sentresponseto'] = 'Respuesta de invitación con éxito enviada a $mailto';
+$labels['localchangeswarning'] = 'Está a punto de realizar cambios que sólo se reflejarán en su calendario y no se enviarán al organizador del evento.';
+$labels['importsuccess'] = 'Se han importado $nr eventos correctamente';
+$labels['importnone'] = 'No se han encontrado eventos para importar';
+$labels['importerror'] = 'Se ha producido un error durante la importación';
+$labels['aclnorights'] = 'No tiene derechos de administrador en este calendario.';
+$labels['changeeventconfirm'] = 'Cambiar evento';
+$labels['removeeventconfirm'] = 'Eliminar evento';
+$labels['changerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea editar solo el evento actual, este y todos los futuros casos, todos los casos o guardarlo como un nuevo evento?';
+$labels['removerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea eliminar solo el evento actual, este y todos los futuros casos o todos los casos de este evento?';
+$labels['removerecurringallonly'] = 'Este es un evento recurrente. Como participante, sólo puede eliminar el evento al completo con todos los casos..';
+$labels['currentevent'] = 'Actual';
+$labels['futurevents'] = 'Futuro';
+$labels['allevents'] = 'Todo';
+$labels['saveasnew'] = 'Guardar como nuevo';
+$labels['birthdays'] = 'Cumpleaños';
+$labels['birthdayscalendar'] = 'Calendario de cumpleaños';
+$labels['displaybirthdayscalendar'] = 'Mostrar calendarios de cumpleaños';
+$labels['birthdayscalendarsources'] = 'Desde esta libreta de direcciones';
+$labels['birthdayeventtitle'] = 'Cumpleaños de $nombre';
+$labels['birthdayage'] = 'Edad $edad';
+$labels['objectchangelog'] = 'Cambiar historial';
+$labels['objectdiff'] = 'Cambiar de $rev1 a $rev2';
+$labels['objectnotfound'] = 'Error al cargar los datos del evento';
+$labels['objectchangelognotavailable'] = 'El historial de cambios no está disponible para este evento';
+$labels['objectdiffnotavailable'] = 'No hay comparación posible que las revisiones seleccionadas';
+$labels['revisionrestoreconfirm'] = '¿Realmente desea restaurar la revisión $rev de este evento? Esto reemplazará el evento actual con la antigua versión.';
+$labels['objectrestoresuccess'] = 'Revisión $rev restaurado correctamente';
+$labels['objectrestoreerror'] = 'No se pudo restaurar la revisión anterior';
+$labels['arialabelminical'] = 'Seleccionar una fecha en el calendario';
+$labels['arialabelcalendarview'] = 'Vista del calendario';
+$labels['arialabelsearchform'] = 'Formulario de búsqueda de eventos';
+$labels['arialabelquicksearchbox'] = 'Entrada en búsqueda de eventos';
+$labels['arialabelcalsearchform'] = 'Formulario de búsqueda de calendarios';
+$labels['calendaractions'] = 'acciones del calendario';
+$labels['arialabeleventattendees'] = 'Lista de participantes del evento';
+$labels['arialabeleventresources'] = 'Lista de recursos del evento';
+$labels['arialabelresourcesearchform'] = 'Formulario de búsqueda de recursos';
+$labels['arialabelresourceselection'] = 'Recursos disponibles';
 ?>
diff --git a/plugins/calendar/localization/et_EE.inc b/plugins/calendar/localization/et_EE.inc
new file mode 100644
index 00000000..ddc0ebfa
--- /dev/null
+++ b/plugins/calendar/localization/et_EE.inc
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = 'Vaikimisi vaade';
+$labels['time_format'] = 'Kellaaja vorming';
+$labels['first_day'] = 'Esimene nädala päev';
+$labels['first_hour'] = 'Esimene tund, mida näidata';
+$labels['workinghours'] = 'Töötunnid';
+$labels['add_category'] = 'Lisa kategooria';
+$labels['remove_category'] = 'Eemalda kategooria';
+$labels['eventcoloring'] = 'Ürituste värv';
+$labels['coloringmode0'] = 'Vastavalt kalendrile';
+$labels['coloringmode1'] = 'Vastavalt kategooriale';
+$labels['afternothing'] = 'Ära tee midagi';
+$labels['aftertrash'] = 'Liiguta prügikasti';
+$labels['aftermoveto'] = 'Liiguta...';
+$labels['weeknonone'] = 'mitte kunagi';
+$labels['calendar'] = 'Kalender';
+$labels['calendars'] = 'Kalendrid';
+$labels['category'] = 'Kategooria';
+$labels['categories'] = 'Kategooriad';
+$labels['addcalendar'] = 'Lisa kalender';
+$labels['createcalendar'] = 'Loo uus kalender';
+$labels['editcalendar'] = 'Muuda kalendri omadusi';
+$labels['name'] = 'Nimi';
+$labels['color'] = 'Värv';
+$labels['day'] = 'Päev';
+$labels['week'] = 'Nädal';
+$labels['month'] = 'Kuu';
+$labels['agenda'] = 'Ajakava';
+$labels['new'] = 'Uus';
+$labels['new_event'] = 'Uus sündmus';
+$labels['edit_event'] = 'Muuda sündmust';
+$labels['edit'] = 'Muuda';
+$labels['save'] = 'Salvesta';
+$labels['removelist'] = 'Eemalda nimekirjast';
+$labels['cancel'] = 'Loobu';
+$labels['select'] = 'Vali';
+$labels['print'] = 'Prindi';
+$labels['printtitle'] = 'Prindi kalendrid';
+$labels['title'] = 'Kokkuvõte';
+$labels['description'] = 'Kirjeldus';
+$labels['all-day'] = 'kogu-päev';
+$labels['export'] = 'Ekspordi';
+$labels['exporttitle'] = 'Ekspordi iCalendar-isse';
+$labels['exportattachments'] = 'Manusega';
+$labels['location'] = 'Asukoht';
+$labels['url'] = 'URL';
+$labels['date'] = 'Kuupäev';
+$labels['start'] = 'Algus';
+$labels['starttime'] = 'Alustamise aeg';
+$labels['end'] = 'Lõpp';
+$labels['endtime'] = 'Lõpu aeg';
+$labels['repeat'] = 'Kordamine';
+$labels['selectdate'] = 'Vali kuupäev';
+$labels['freebusy'] = 'Näita mulle kui';
+$labels['free'] = 'Vaba';
+$labels['busy'] = 'Hõivatud';
+$labels['outofoffice'] = 'Pole kontoris';
+$labels['mystatus'] = 'Minu staatus';
+$labels['status'] = 'Staatus';
+$labels['status-confirmed'] = 'Kinnitatud';
+$labels['status-cancelled'] = 'Tühistatud';
+$labels['priority'] = 'Tähtsus';
+$labels['sensitivity'] = 'Privaatsus';
+$labels['public'] = 'avalik';
+$labels['private'] = 'privaatne';
+$labels['confidential'] = 'konfidentsiaalne';
+$labels['links'] = 'Viide';
+$labels['alarms'] = 'Meeldetuletus';
+$labels['comment'] = 'Kommenteeri';
+$labels['created'] = 'Loodud';
+$labels['changed'] = 'Viimati muudetud';
+$labels['unknown'] = 'Teadmata';
+$labels['eventoptions'] = 'Valikud';
+$labels['eventhistory'] = 'Ajalugu';
+$labels['printdescriptions'] = 'Prindi kirjeldused';
+$labels['parentcalendar'] = 'Sisesta';
+$labels['earlierevents'] = 'Varem';
+$labels['laterevents'] = 'Hiljem';
+$labels['andnmore'] = 'veel $nr ...';
+$labels['createfrommail'] = 'Salvesta sündmusena';
+$labels['importevents'] = 'Impordi sündmuseid';
+$labels['onemonthback'] = '1 kuu tagasi';
+$labels['nmonthsback'] = '$nr kuud tagasi';
+$labels['showurl'] = 'Näita kalendri URL-i';
+$labels['calsearchresults'] = 'Saadaolevad kalendrid';
+$labels['nocalendarsfound'] = 'Ühtegi kalendrit ei leitud';
+$labels['nrcalendarsfound'] = 'Leiti $nr kalendrit';
+$labels['quickview'] = 'Vaata ainult seda kalendrit';
+$labels['rsvpcomment'] = 'Kutse tekst';
+$labels['until'] = 'kuni';
+$labels['today'] = 'Täna';
+$labels['tomorrow'] = 'Homme';
+$labels['thisweek'] = 'See nädal';
+$labels['nextweek'] = 'Järgmine nädal';
+$labels['prevweek'] = 'Eelmine nädal';
+$labels['thismonth'] = 'Sellel kuul';
+$labels['nextmonth'] = 'Järgmisel kuul';
+$labels['weekofyear'] = 'NädalNädal';
+$labels['pastevents'] = 'Minevikus';
+$labels['futureevents'] = 'Tulevikus';
+$labels['showalarms'] = 'Näita meeldetuletusi';
+$labels['attendee'] = 'Osaleja';
+$labels['role'] = 'Roll';
+$labels['availability'] = 'Saadaval';
+$labels['confirmstate'] = 'Steatus';
+$labels['addattendee'] = 'Lisa osaleja';
+$labels['roleorganizer'] = 'Organiseerija';
+$labels['rolerequired'] = 'Nõutud';
+$labels['roleoptional'] = 'Valikuline';
+$labels['cutypegroup'] = 'Grupp';
+$labels['cutyperesource'] = 'Ressurss';
+$labels['cutyperoom'] = 'Ruum';
+$labels['availfree'] = 'Vaba';
+$labels['availbusy'] = 'Hõivatud';
+$labels['availunknown'] = 'Teadmata';
+$labels['availoutofoffice'] = 'Pole kontoris';
+$labels['sendinvitations'] = 'Saada kutsed';
+$labels['prevslot'] = 'Eelmine koht';
+$labels['nextslot'] = 'Järgmine koht';
+$labels['suggestedslot'] = 'Soovitatud koht';
+$labels['updatemycopy'] = 'Uuenda minu kalendrid';
+$labels['savetocalendar'] = 'Salvesta kalendrisse';
+$labels['openpreview'] = 'Kontrolli kalendrit';
+$labels['legend'] = 'Märgistus';
+$labels['resource'] = 'Ressurss';
+$labels['resourcedetails'] = 'Üksikasjad';
+$labels['resourceavailability'] = 'Saadavus';
+$labels['resourceowner'] = 'Omanik';
+$labels['tabsummary'] = 'Kokkuvõte';
+$labels['tabrecurrence'] = 'Kordumine';
+$labels['tabattendees'] = 'Osalejad';
+$labels['tabresources'] = 'Ressursid';
+$labels['tabattachments'] = 'Manused';
+$labels['tabsharing'] = 'Jagamine';
+$labels['deleteobjectconfirm'] = 'Kas sa tõesti soovid seda sündmust kustutada?';
+$labels['deleteventconfirm'] = 'Kas sa tõesti soovid seda sündmust kustutada?';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['errorsaving'] = 'Muudatuste salvestamine ebaõnnestus.';
+$labels['errorimportingevent'] = 'Sündmuse importimine ebaõnnestus';
+$labels['nowritecalendarfound'] = 'Ei leitud ühtegi kalendrit kuhu sündmusi salvestada';
+$labels['itipinvalidrequest'] = 'See kutse ei kehti enam';
+$labels['importerror'] = 'Importimisel tekkis tõrge';
+$labels['changeeventconfirm'] = 'Muuda sündmust';
+$labels['removeeventconfirm'] = 'Kustuta sündmus';
+$labels['currentevent'] = 'Praegune';
+$labels['futurevents'] = 'TulevikusTulevane';
+$labels['allevents'] = 'Kõik';
+$labels['saveasnew'] = 'Salvesta uuena';
+$labels['birthdays'] = 'Sünnipäevad';
+$labels['birthdayscalendar'] = 'Sünnipäevade kalender';
+$labels['objectchangelog'] = 'Muuda ajalugu';
+$labels['objectdiff'] = 'Muudatused versioonide $rev1 ja $rev2 vahel';
+$labels['arialabelcalendarview'] = 'Kalendri vaade';
+$labels['calendaractions'] = 'Kalendri toimingud';
+$labels['calendarprops'] = 'Kalendri omadused';
+$labels['arialabelresourceselection'] = 'Saadaolevad ressursid';
+?>
diff --git a/plugins/calendar/localization/fi_FI.inc b/plugins/calendar/localization/fi_FI.inc
index 3b3089b6..ef7c299b 100644
--- a/plugins/calendar/localization/fi_FI.inc
+++ b/plugins/calendar/localization/fi_FI.inc
@@ -25,10 +25,15 @@ $labels['afterflagdeleted'] = 'Merkitse poistettavaksi';
 $labels['aftermoveto'] = 'Siirrä...';
 $labels['itipoptions'] = 'Tapahtuman kutsut';
 $labels['afteraction'] = 'Kun kutsu tai päivitysviesti on käsitelty';
+$labels['showweekno'] = 'Näytä viikkonumerot';
+$labels['weeknonone'] = 'ei koskaan';
+$labels['weeknodatepicker'] = 'vain päivävalitsimessa';
+$labels['weeknoall'] = 'päivävalitsimessa ja kalenterinäkymässä';
 $labels['calendar'] = 'Kalenteri';
 $labels['calendars'] = 'Kalenterit';
 $labels['category'] = 'Luokka';
 $labels['categories'] = 'Luokat';
+$labels['addcalendar'] = 'Lisää kalenteri';
 $labels['createcalendar'] = 'Luo uusi kalenteri';
 $labels['editcalendar'] = 'Muokkaa kalenterin ominaisuuksia';
 $labels['name'] = 'Nimi';
@@ -73,6 +78,7 @@ $labels['mystatus'] = 'Tilani';
 $labels['status'] = 'Tila';
 $labels['status-confirmed'] = 'Vahvistettu';
 $labels['status-cancelled'] = 'Peruttu';
+$labels['status-tentative'] = 'Alustava';
 $labels['priority'] = 'Tärkeys';
 $labels['sensitivity'] = 'Yksityisyys';
 $labels['public'] = 'julkinen';
@@ -92,6 +98,8 @@ $labels['printdescriptions'] = 'Tulosta kuvaukset';
 $labels['parentcalendar'] = 'Aseta sisään';
 $labels['searchearlierdates'] = '« Etsi aiempia tapahtumia';
 $labels['searchlaterdates'] = 'Etsi myöhempiä tapahtumia »';
+$labels['earlierevents'] = 'Aiemmin';
+$labels['laterevents'] = 'Myöhemmin';
 $labels['andnmore'] = '$nr lisää...';
 $labels['togglerole'] = 'Klikkaa vaihtaaksesi rooli';
 $labels['createfrommail'] = 'Tallenna tapahtumana';
@@ -104,6 +112,7 @@ $labels['showurldescription'] = 'Käytä seuraavia osoitteita avataksesi kalente
 $labels['caldavurldescription'] = 'Kopioi tämä osoite <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a-asiakassovellukseen (esim. Evolution tai Mozilla Thunderbird) synkronoidaksesi tämän kalenterin tietokoneesi tai mobiililaitteesi kanssa.';
 $labels['findcalendars'] = 'Etsi kalentereita...';
 $labels['searchterms'] = 'Hakuehdot';
+$labels['findevents'] = 'Etsi tapahtumia';
 $labels['calsearchresults'] = 'Saatavilla olevat kalenterit';
 $labels['calendarsubscribe'] = 'Luetteloi pysyvästi';
 $labels['nocalendarsfound'] = 'Kalentereita ei löytynyt';
@@ -113,6 +122,7 @@ $labels['invitationspending'] = 'Odottavat kutsut';
 $labels['invitationsdeclined'] = 'Torjutut kutsut';
 $labels['changepartstat'] = 'Muuta osallistujan tilaa';
 $labels['rsvpcomment'] = 'Kutsuteksti';
+$labels['weekshort'] = 'Vko';
 $labels['listrange'] = 'Näytettävä aikaväli';
 $labels['listsections'] = 'Jaa osiin:';
 $labels['smartsections'] = 'Älykkäät osiot';
@@ -149,8 +159,6 @@ $labels['availbusy'] = 'Varattu';
 $labels['availunknown'] = 'Tuntematon';
 $labels['availtentative'] = 'Alustava';
 $labels['availoutofoffice'] = 'Ei toimistolla';
-$labels['delegatedto'] = 'Delegoitu henkilölle:';
-$labels['delegatedfrom'] = 'Delegoitus henkilöltä:';
 $labels['scheduletime'] = 'Etsi saatavuus';
 $labels['sendinvitations'] = 'Lähetä kutsut';
 $labels['sendnotifications'] = 'Ilmoita osallistujille muutoksista';
@@ -162,7 +170,6 @@ $labels['nextslot'] = 'Seuraava ajankohta';
 $labels['suggestedslot'] = 'Ehdotettu ajankohta';
 $labels['noslotfound'] = 'Vapaata ajankohtaa ei löytynyt';
 $labels['invitationsubject'] = 'Sinut on kutsuttu tapahtumaan "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nMilloin: \$date\n\nKutsutut: \$attendees\n\nOhessa iCalendar -tiedosto mistä löytyvät kaikki tapahtuman yksityistiedot. Voit tuoda tämän tiedoston kalenteriohjelmaasi.";
 $labels['invitationattendlinks'] = "Mikäli sähköpostiohjelmasi ei tue iTip pyyntöjä, voit aina käyttää ao. osoitetta kutsun hyväksymiseen / hylkäämiseen:\n\$url";
 $labels['eventupdatesubject'] = '"$title" on päivitetty';
 $labels['eventupdatesubjectempty'] = 'Sinua koskeva tapahtuma on päivitetty';
@@ -193,6 +200,7 @@ $labels['addresource'] = 'Varaa resurssi';
 $labels['findresources'] = 'Etsi resursseja';
 $labels['resourcedetails'] = 'Tiedot';
 $labels['resourceavailability'] = 'Saatavuus';
+$labels['resourceprops'] = 'Resurssin ominaisuudet';
 $labels['resourceowner'] = 'Omistaja';
 $labels['resourceadded'] = 'Resurssi on liitetty tapahtumaasi';
 $labels['tabsummary'] = 'Yhteenveto';
@@ -221,6 +229,7 @@ $labels['nowritecalendarfound'] = 'Tapahtuman tallentamiseksi ei löytynyt kalen
 $labels['importedsuccessfully'] = 'Tapahtuma lisättiin onnistuneesti kalenteriin \'$calendar\'';
 $labels['updatedsuccessfully'] = 'Tapahtuma on onnistuneesti päivitetty kalenterissa \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Osallistujan tila päivitetty onnistuneesti';
+$labels['errorunknownattendee'] = 'Osallistujatietojen löytäminen epäonnistui.';
 $labels['itipsendsuccess'] = 'Kutsu lähetetty osallistujille.';
 $labels['itipresponseerror'] = 'Vastauksen lähettäminen tapahtumakutsuun epäonnistui';
 $labels['itipinvalidrequest'] = 'Kutsu ei ole enää kelvollinen';
@@ -230,6 +239,7 @@ $labels['importsuccess'] = '$nr tapahtumaa tuotiin onnistuneesti';
 $labels['importnone'] = 'Tuotavaksi tarkoitettuja tapahtumia ei löytynyt';
 $labels['importerror'] = 'Tuotaessa tapahtui virhe';
 $labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän kalenteriin.';
+$labels['importtext'] = 'Voit lähettää tapahtumia <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a>-muodossa (.ics).';
 $labels['changeeventconfirm'] = 'Vaihda tapahtuma';
 $labels['removeeventconfirm'] = 'Poista tapahtuma';
 $labels['changerecurringeventwarning'] = 'Tämä on tuistuva tapahtuma. Haluatko muokata vain tätä ajankohtaa, tätä ja tulevia tapahtuman ajankohtia, kaikkia tapahtuman ajankohtia vai tallentaa kokonaan uutena tapahtumana? ';
@@ -259,8 +269,10 @@ $labels['arialabelsearchform'] = 'Tapahtumahaun lomake';
 $labels['arialabelquicksearchbox'] = 'Tapatumahaun syöte';
 $labels['arialabelcalsearchform'] = 'Kalenterihakujen lomake';
 $labels['calendaractions'] = 'Kalenterin toiminnot';
+$labels['calendarprops'] = 'Kalenterin ominaisuudet';
 $labels['arialabeleventattendees'] = 'Tapahtuman osallistujalista';
 $labels['arialabeleventresources'] = 'Tapahtuman resurssilista';
 $labels['arialabelresourcesearchform'] = 'Resurssien hakulomake';
 $labels['arialabelresourceselection'] = 'Saatavilla olevat resurssit';
+$labels['arialabeleventform'] = 'Tapahtuman muokkauslomake';
 ?>
diff --git a/plugins/calendar/localization/fr_FR.inc b/plugins/calendar/localization/fr_FR.inc
index a09bef0e..5dcced43 100644
--- a/plugins/calendar/localization/fr_FR.inc
+++ b/plugins/calendar/localization/fr_FR.inc
@@ -14,9 +14,9 @@ $labels['first_hour'] = 'Première heure à afficher';
 $labels['workinghours'] = 'Heures de travail';
 $labels['add_category'] = 'Ajouter une catégorie';
 $labels['remove_category'] = 'Supprimer une catégorie';
-$labels['defaultcalendar'] = 'Ajouter un nouvel évènement';
-$labels['eventcoloring'] = 'Couleurs des évènements';
-$labels['coloringmode0'] = 'Selon l\'agenda';
+$labels['defaultcalendar'] = 'Ajouter un nouvel événement';
+$labels['eventcoloring'] = 'Couleurs des événements';
+$labels['coloringmode0'] = 'Selon le calendrier';
 $labels['coloringmode1'] = 'Selon la catégorie';
 $labels['coloringmode2'] = 'Calendrier en contour, catégorie en contenu';
 $labels['coloringmode3'] = 'Catégorie en contour, calendrier en contenu';
@@ -25,14 +25,15 @@ $labels['aftertrash'] = 'Déplacer dans la corbeille';
 $labels['afterdelete'] = 'Supprimer ce message';
 $labels['afterflagdeleted'] = 'Marquer comme supprimer';
 $labels['aftermoveto'] = 'Déplacer vers...';
-$labels['itipoptions'] = 'Invitations à l\'évenement';
+$labels['itipoptions'] = 'Invitations à l\'événement';
 $labels['afteraction'] = 'Après une invitation ou une modification, le message est traité';
-$labels['calendar'] = 'Agenda';
-$labels['calendars'] = 'Agendas';
+$labels['weeknonone'] = 'jamais';
+$labels['calendar'] = 'Calendrier';
+$labels['calendars'] = 'Calendriers';
 $labels['category'] = 'Catégorie';
 $labels['categories'] = 'Catégories';
-$labels['createcalendar'] = 'Créer un nouvel agenda';
-$labels['editcalendar'] = 'Modifier les propriétés de l\'agenda';
+$labels['createcalendar'] = 'Créer un nouveau calendrier';
+$labels['editcalendar'] = 'Modifier les propriétés du calendrier';
 $labels['name'] = 'Nom';
 $labels['color'] = 'Couleur';
 $labels['day'] = 'Jour';
@@ -40,41 +41,42 @@ $labels['week'] = 'Semaine';
 $labels['month'] = 'Mois';
 $labels['agenda'] = 'Ordre du jour';
 $labels['new'] = 'Nouveau';
-$labels['new_event'] = 'Nouvel évènement';
-$labels['edit_event'] = 'Modifier l\'évènement';
+$labels['new_event'] = 'Nouvel événement';
+$labels['edit_event'] = 'Modifier l\'événement';
 $labels['edit'] = 'Modifier';
 $labels['save'] = 'Enregistrer';
-$labels['removelist'] = 'supprimer de la liste';
+$labels['removelist'] = 'Supprimer de la liste';
 $labels['cancel'] = 'Annuler';
 $labels['select'] = 'Sélectionner';
 $labels['print'] = 'Imprimer';
-$labels['printtitle'] = 'Imprimer les agendas';
+$labels['printtitle'] = 'Imprimer les calendriers';
 $labels['title'] = 'Résumé';
 $labels['description'] = 'Description';
-$labels['all-day'] = 'Toute la journée';
+$labels['all-day'] = 'toute la journée';
 $labels['export'] = 'Exporter';
 $labels['exporttitle'] = 'Exporter vers iCalendar';
-$labels['exportrange'] = 'Évènements depuis';
-$labels['exportattachments'] = 'With attachments';
+$labels['exportrange'] = 'Événements depuis';
+$labels['exportattachments'] = 'Avec pièces jointes';
 $labels['customdate'] = 'Date personnalisée';
 $labels['location'] = 'Lieu';
 $labels['url'] = 'URL';
 $labels['date'] = 'Date';
 $labels['start'] = 'Début';
-$labels['starttime'] = 'Début';
+$labels['starttime'] = 'Heure de début';
 $labels['end'] = 'Fin';
-$labels['endtime'] = 'Fin';
+$labels['endtime'] = 'Heure de fin';
 $labels['repeat'] = 'Répéter';
 $labels['selectdate'] = 'Sélectionner une date';
-$labels['freebusy'] = 'Montrez moi comme';
+$labels['freebusy'] = 'Montrez-moi en tant que';
 $labels['free'] = 'Libre';
 $labels['busy'] = 'Occupé';
 $labels['outofoffice'] = 'Absent';
 $labels['tentative'] = 'Provisoire';
-$labels['mystatus'] = 'Mon status';
+$labels['mystatus'] = 'Mon statut';
 $labels['status'] = 'Statut';
 $labels['status-confirmed'] = 'Confirmé';
-$labels['status-cancelled'] = 'Annulée';
+$labels['status-cancelled'] = 'Annulé';
+$labels['status-tentative'] = 'Provisoire';
 $labels['priority'] = 'Priorité';
 $labels['sensitivity'] = 'Diffusion';
 $labels['public'] = 'publique';
@@ -83,7 +85,7 @@ $labels['confidential'] = 'Confidentiel';
 $labels['links'] = 'Référence';
 $labels['alarms'] = 'Rappel';
 $labels['comment'] = 'Commentaire';
-$labels['created'] = 'Créée';
+$labels['created'] = 'Créé';
 $labels['changed'] = 'Dernière modification';
 $labels['unknown'] = 'Inconnu';
 $labels['eventoptions'] = 'Options';
@@ -92,39 +94,40 @@ $labels['eventhistory'] = 'Historique';
 $labels['removelink'] = 'Enlever référence d\'e-mail';
 $labels['printdescriptions'] = 'Imprimer les descriptions';
 $labels['parentcalendar'] = 'Ajouter à l\'intérieur';
-$labels['searchearlierdates'] = '« Chercher des évènements plus ancien';
-$labels['searchlaterdates'] = 'Chercher des évènement plus récent »';
+$labels['searchearlierdates'] = '« Chercher des événements plus anciens';
+$labels['searchlaterdates'] = 'Chercher des événement plus récents »';
+$labels['laterevents'] = 'Plus tard';
 $labels['andnmore'] = '$nr de plus...';
 $labels['togglerole'] = 'Cliquez pour changer de rôle';
-$labels['createfrommail'] = 'Enregistrer comme un évènement';
-$labels['importevents'] = 'Importer des évènements';
-$labels['importrange'] = 'Évènements depuis';
-$labels['onemonthback'] = '1 mois précédent';
+$labels['createfrommail'] = 'Enregistrer comme un événement';
+$labels['importevents'] = 'Importer des événements';
+$labels['importrange'] = 'Événements depuis';
+$labels['onemonthback'] = '1 mois auparavant';
 $labels['nmonthsback'] = '$nr mois précédents';
-$labels['showurl'] = 'Afficher l\'URL de l\'agenda';
-$labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder(lecture seule) à votre agenda depuis une autre application. Vous pouvez copier/coller celle-ci dans n\'importe quel agenda électronique gérant le format iCal.';
-$labels['caldavurldescription'] = 'Copiez cette adresse vers une application client (comme Evolution ou Mozilla Thunderbird) compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> pour synchroniser ce calendrier avec votre ordinateur ou votre smartphone.';
+$labels['showurl'] = 'Afficher l\'URL du calendrier';
+$labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder (lecture seule) à votre calendrier depuis d\'autres applications. Vous pouvez copier/coller celle-ci dans n\'importe quel calendrier électronique gérant le format iCal.';
+$labels['caldavurldescription'] = 'Copiez cette adresse vers une application client (comme Evolution ou Mozilla Thunderbird) compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> pour synchroniser pleinement ce calendrier avec votre ordinateur ou votre smartphone.';
 $labels['findcalendars'] = 'Recherche de calendriers...';
 $labels['searchterms'] = 'Critères de recherche';
 $labels['calsearchresults'] = 'Calendriers disponibles';
 $labels['calendarsubscribe'] = 'Lister définitivement';
-$labels['nocalendarsfound'] = 'Aucun calendriers trouvés';
+$labels['nocalendarsfound'] = 'Aucun calendrier trouvé';
 $labels['nrcalendarsfound'] = '$nr calendriers trouvés';
 $labels['quickview'] = 'Voir uniquement ce calendrier';
 $labels['invitationspending'] = 'Invitations en attente';
 $labels['invitationsdeclined'] = 'Invitations refusées';
-$labels['changepartstat'] = 'Changer le statut du participent';
+$labels['changepartstat'] = 'Changer le statut du participant';
 $labels['rsvpcomment'] = 'Texte d\'invitation';
 $labels['listrange'] = 'Intervalle à afficher :';
 $labels['listsections'] = 'Diviser en :';
-$labels['smartsections'] = 'Section intelligente';
+$labels['smartsections'] = 'Sections intelligentes';
 $labels['until'] = 'jusqu\'à';
 $labels['today'] = 'Aujourd\'hui';
 $labels['tomorrow'] = 'Demain';
 $labels['thisweek'] = 'Cette semaine';
 $labels['nextweek'] = 'Semaine prochaine';
 $labels['prevweek'] = 'Semaine précédente';
-$labels['thismonth'] = 'Ce mois';
+$labels['thismonth'] = 'Ce mois-ci';
 $labels['nextmonth'] = 'Mois prochain';
 $labels['weekofyear'] = 'Semaine';
 $labels['pastevents'] = 'Passé';
@@ -139,10 +142,10 @@ $labels['confirmstate'] = 'Statut';
 $labels['addattendee'] = 'Ajouter participant';
 $labels['roleorganizer'] = 'Organisateur';
 $labels['rolerequired'] = 'Requis';
-$labels['roleoptional'] = 'Optionel';
-$labels['rolechair'] = 'Chair';
+$labels['roleoptional'] = 'Optionnel';
+$labels['rolechair'] = 'Présidence';
 $labels['rolenonparticipant'] = 'Absent';
-$labels['cutypeindividual'] = 'Individual';
+$labels['cutypeindividual'] = 'Individuel';
 $labels['cutypegroup'] = 'Groupe';
 $labels['cutyperesource'] = 'Ressource';
 $labels['cutyperoom'] = 'Salle';
@@ -151,112 +154,115 @@ $labels['availbusy'] = 'Occupé';
 $labels['availunknown'] = 'Inconnu';
 $labels['availtentative'] = 'Provisoire';
 $labels['availoutofoffice'] = 'Absent';
-$labels['delegatedto'] = 'Délégué à :';
-$labels['delegatedfrom'] = 'Délégué de :';
 $labels['scheduletime'] = 'Trouver les disponibilités';
 $labels['sendinvitations'] = 'Envoyer les invitations';
 $labels['sendnotifications'] = 'Informer les participants des modifications';
 $labels['sendcancellation'] = 'Informer les participants de l\'annulation';
 $labels['onlyworkinghours'] = 'Trouver des disponibilités en fonction de mes heures de travail';
-$labels['reqallattendees'] = 'Demandé/tous';
+$labels['reqallattendees'] = 'Demandé/tous les participants';
 $labels['prevslot'] = 'Créneau précédent';
 $labels['nextslot'] = 'Créneau suivant';
 $labels['suggestedslot'] = 'Emplacement suggéré';
 $labels['noslotfound'] = 'Impossible de trouver un créneau disponible';
 $labels['invitationsubject'] = 'Vous avez été invité à "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les détails de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\". Vous pouvez utiliser ce lien pour accepter ou refuser l'invitation : \n\$url";
+$labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\", vous pouvez utiliser ce lien pour accepter ou refuser l'invitation : \n\$url";
 $labels['eventupdatesubject'] = '"$title" a été modifié';
-$labels['eventupdatesubjectempty'] = 'Un évènement vous concernant a été modifié';
-$labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
+$labels['eventupdatesubjectempty'] = 'Un événement vous concernant a été modifié';
+$labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec toutes les modifications à l'événement que vous pourrez importer dans votre calendrier électronique.";
 $labels['eventcancelsubject'] = '"$title" a été annulé';
-$labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'évènement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['itipobjectnotfound'] = 'L\'évènement lié à ce message n\'a pas été trouvé dans votre calendrier.';
-$labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender a rejeté votre participation à l’évènement suivant :\n\n*\$title*\n\nLe: \$date";
-$labels['itipdeclineevent'] = 'Voulez-vous refuser l\'invitation à cet évènement?';
-$labels['declinedeleteconfirm'] = 'Voulez-vous aussi supprimer cet évènement annulé, de votre calendrier ?';
+$labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'événement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'événement que vous pourrez importer dans votre calendrier électronique.";
+$labels['itipobjectnotfound'] = 'L\'événement lié à ce message n\'a pas été trouvé dans votre calendrier.';
+$labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'événement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'événement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'événement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender a rejeté votre participation à l’événement suivant :\n\n*\$title*\n\nLe: \$date";
+$labels['itipmailbodydelegated'] = "\$sender a délégué la participation à l'événement suivant : \n\n*\$title*\n\nQuand: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender vous a délégué la participation à l'événement suivant : \n\n*\$title*\n\nQuand : \$date";
+$labels['itipdeclineevent'] = 'Voulez-vous refuser l\'invitation à cet événement?';
+$labels['declinedeleteconfirm'] = 'Voulez-vous aussi supprimer cet événement annulé de votre calendrier ?';
 $labels['itipcomment'] = 'Commentaire d’invitation ou de notification';
 $labels['itipcommenttitle'] = 'Ce commentaire sera inséré dans le message d\'invitation ou de notification envoyé aux participants';
-$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
-$labels['eventcancelled'] = 'L\'évènement a été annulé';
-$labels['saveincalendar'] = 'Enregistrer sous';
+$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet événement';
+$labels['eventcancelled'] = 'L\'événement a été annulé';
+$labels['saveincalendar'] = 'enregistrer sous';
 $labels['updatemycopy'] = 'Mise à jour dans mon calendrier';
 $labels['savetocalendar'] = 'Sauvegarde dans le calendrier';
-$labels['openpreview'] = 'Test calendrier';
-$labels['noearlierevents'] = 'Aucun évènements passé';
-$labels['nolaterevents'] = 'Aucun évènement futur';
+$labels['openpreview'] = 'Consulter le calendrier';
+$labels['noearlierevents'] = 'Aucun événement passé';
+$labels['nolaterevents'] = 'Aucun événement futur';
 $labels['resource'] = 'Ressource';
 $labels['addresource'] = 'Carnet de ressources';
 $labels['findresources'] = 'Recherche des ressources';
 $labels['resourcedetails'] = 'Détails';
 $labels['resourceavailability'] = 'Disponibilité';
 $labels['resourceowner'] = 'Propriétaire';
-$labels['resourceadded'] = 'Cette ressource a été ajouté à l\'évènement';
+$labels['resourceadded'] = 'Cette ressource a été ajoutée à l\'événement';
 $labels['tabsummary'] = 'Résumé';
 $labels['tabrecurrence'] = 'Récurrence';
 $labels['tabattendees'] = 'Participants';
 $labels['tabresources'] = 'Ressources';
 $labels['tabattachments'] = 'Pièces jointes';
 $labels['tabsharing'] = 'Partage';
-$labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
-$labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
-$labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer cet agenda et tous ses évènements?';
-$labels['deletecalendarconfirmrecursive'] = 'Voulez-vous vraiment supprimer ce calendrier avec tous ces évènements et ces sous calendriers ?';
+$labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet événement?';
+$labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet événement?';
+$labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer ce calendrier et tous ses événements?';
+$labels['deletecalendarconfirmrecursive'] = 'Voulez-vous vraiment supprimer ce calendrier avec tous ses événements et ses sous-calendriers ?';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['errorsaving'] = 'Échec lors de l\'enregistrement des changements';
 $labels['operationfailed'] = 'L\'opération demandée a échoué';
-$labels['invalideventdates'] = 'Dates invalides! Veuillez vérifier votre saisie.';
-$labels['invalidcalendarproperties'] = 'Propriétés d\'agenda invalides! Veuillez saisir un nom valide.';
-$labels['searchnoresults'] = 'Pas d\'évènement trouvé dans les agendas sélectionnés.';
-$labels['successremoval'] = 'L\'évènement a été supprimé.';
-$labels['successrestore'] = 'L\'évènement a été restauré.';
-$labels['errornotifying'] = 'Échec de l\'envoi de notification aux participants ';
-$labels['errorimportingevent'] = 'Échec de l\'import de l\'évènement';
-$labels['importwarningexists'] = 'Une copie de cet évènement existe déjà dans votre calendrier.';
-$labels['newerversionexists'] = 'Une nouvelle version de cet évènement existe! Abandon.';
-$labels['nowritecalendarfound'] = 'Pas d\'agenda trouvé pour enregistrer l\'évènement';
-$labels['importedsuccessfully'] = 'L\'évènement a été ajouté à l\'agenda \'$calendar\'';
-$labels['updatedsuccessfully'] = 'Cet évènement a été modifié avec succès dans \'$calendar\'';
+$labels['invalideventdates'] = 'Dates invalides ! Veuillez vérifier votre saisie.';
+$labels['invalidcalendarproperties'] = 'Propriétés du calendrier invalides ! Veuillez saisir un nom valide.';
+$labels['searchnoresults'] = 'Pas d\'événement trouvé dans les calendriers sélectionnés.';
+$labels['successremoval'] = 'L\'événement a été supprimé.';
+$labels['successrestore'] = 'L\'événement a été restauré.';
+$labels['errornotifying'] = 'Échec de l\'envoi de notifications aux participants ';
+$labels['errorimportingevent'] = 'Échec de l\'import de l\'événement';
+$labels['importwarningexists'] = 'Une copie de cet événement existe déjà dans votre calendrier.';
+$labels['newerversionexists'] = 'Une nouvelle version de cet événement existe ! Abandon.';
+$labels['nowritecalendarfound'] = 'Pas de calendrier trouvé pour enregistrer l\'événement';
+$labels['importedsuccessfully'] = 'L\'événement a été ajouté à l\'agenda \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Cet événement a été modifié avec succès dans \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Le statut des participants a été modifié';
-$labels['itipsendsuccess'] = 'Invitation envoyé aux participants.';
-$labels['itipresponseerror'] = 'Échec de l\'envoi d\'une réponse à cette invitation.';
-$labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide.';
-$labels['sentresponseto'] = 'La réponse à l\'invitation a été envoyé à $mailto';
-$labels['localchangeswarning'] = 'Vous êtes sur le point d\'effectuer des modifications qui seront effectifs sur votre calendrier mais qui ne seront pas envoyés à l\'organisateur de l’évènement.';
-$labels['importsuccess'] = '$nr évènements importés.';
-$labels['importnone'] = 'Pas d\'évènements à importer';
-$labels['importerror'] = 'Une erreur est arrivée lors de l\'import';
-$labels['aclnorights'] = 'Vous n\'avez pas les droits d\'administration sur cet agenda.';
-$labels['changeeventconfirm'] = 'Modifier l\'évènement';
-$labels['removeeventconfirm'] = 'Supprimer l\'évènement';
-$labels['changerecurringeventwarning'] = 'Ceci est un évènement récurant. Voulez vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel évènement? ';
-$labels['removerecurringeventwarning'] = 'Ceci est un évènement recrurent. Voulez-vous supprimer uniquement l\'évènement courent, l’évènement courent et toutes ces occurrences futures ou toutes les occurrences ?';
+$labels['itipsendsuccess'] = 'Invitation envoyée aux participants.';
+$labels['itipresponseerror'] = 'Échec de l\'envoi d\'une réponse à cette invitation';
+$labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide';
+$labels['sentresponseto'] = 'La réponse à l\'invitation a été envoyée à $mailto';
+$labels['localchangeswarning'] = 'Vous êtes sur le point d\'effectuer des modifications qui seront effectives dans votre calendrier mais qui ne seront pas envoyées à l\'organisateur de l’événement.';
+$labels['importsuccess'] = '$nr événements importés.';
+$labels['importnone'] = 'Pas d\'événement à importer';
+$labels['importerror'] = 'Une erreur s\'est produite lors de l\'importation';
+$labels['aclnorights'] = 'Vous ne disposez pas des droits d\'administrateur sur ce calendrier.';
+$labels['changeeventconfirm'] = 'Modifier l\'événement';
+$labels['removeeventconfirm'] = 'Supprimer l\'événement';
+$labels['changerecurringeventwarning'] = 'Ceci est un événement récurrent. Voulez-vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel événement ? ';
+$labels['removerecurringeventwarning'] = 'Ceci est un événement récurrent. Voulez-vous supprimer l\'événement courant uniquement, l’événement courant et toutes les occurrences futures, ou toutes les occurrences ?';
+$labels['removerecurringallonly'] = 'Ceci est un événement récurrent. En tant que participant, vous pouvez seulement supprimer l\'événement entier avec toutes les occurrences.';
 $labels['currentevent'] = 'Cette occurrence';
 $labels['futurevents'] = 'Cette occurrence et toutes les suivantes';
 $labels['allevents'] = 'Toutes les occurrences';
-$labels['saveasnew'] = 'Enregistrer comme un nouvel évènement';
+$labels['saveasnew'] = 'Enregistrer comme un nouvel événement';
 $labels['birthdays'] = 'Anniversaires';
 $labels['birthdayscalendar'] = 'Calendrier des anniversaires';
 $labels['displaybirthdayscalendar'] = 'Afficher le calendrier des anniversaires';
 $labels['birthdayscalendarsources'] = 'Depuis ces carnets d\'adresses';
 $labels['birthdayeventtitle'] = 'Anniversaire de $name';
-$labels['birthdayage'] = 'Age $age';
+$labels['birthdayage'] = 'Âge $age';
 $labels['objectchangelog'] = 'Historique des modifications';
-$labels['objectnotfound'] = 'Impossible de charger les données de l’évènement';
-$labels['objectchangelognotavailable'] = 'Il n\'y a pas d\'historique des modifications pour cet évènement';
+$labels['objectdiff'] = 'Modifications de $rev1 à $rev2';
+$labels['objectnotfound'] = 'Impossible de charger les données de l’événement';
+$labels['objectchangelognotavailable'] = 'Il n\'y a pas d\'historique des modifications pour cet événement';
 $labels['objectdiffnotavailable'] = 'La comparaison des versions sélectionnées est impossible';
-$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer le version $rev de cet évènement ? Cette action va remplacer l\'évènement courent  par l\'ancienne version.';
+$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer le version $rev de cet événement ? Cette action va remplacer l\'événement actuel par l\'ancienne version.';
+$labels['objectrestoresuccess'] = 'La révision $rev a été restaurée avec succès';
+$labels['objectrestoreerror'] = 'Échec lors de la restauration de la précédente révision';
 $labels['arialabelminical'] = 'Sélection de la date du calendrier';
 $labels['arialabelcalendarview'] = 'Vue du calendrier';
-$labels['arialabelsearchform'] = 'Recherche d\'évènements depuis';
-$labels['arialabelquicksearchbox'] = 'Saisie de le recherche d\'évènements';
+$labels['arialabelsearchform'] = 'Recherche d\'événements depuis';
+$labels['arialabelquicksearchbox'] = 'Saisie de le recherche d\'événements';
 $labels['arialabelcalsearchform'] = 'Recherche de calendriers';
 $labels['calendaractions'] = 'Actions calendrier';
-$labels['arialabeleventattendees'] = 'Liste des participants à l\'évènement';
-$labels['arialabeleventresources'] = 'Liste des ressources de l\'évènement';
-$labels['arialabelresourcesearchform'] = 'Recherche des ressources';
+$labels['arialabeleventattendees'] = 'Liste des participants à l\'événement';
+$labels['arialabeleventresources'] = 'Liste des ressources de l\'événement';
+$labels['arialabelresourcesearchform'] = 'Formulaire de recherche des ressources';
 $labels['arialabelresourceselection'] = 'Ressources disponibles';
 ?>
diff --git a/plugins/calendar/localization/he_IL.inc b/plugins/calendar/localization/he_IL.inc
new file mode 100644
index 00000000..2c18c3d1
--- /dev/null
+++ b/plugins/calendar/localization/he_IL.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['status-tentative'] = 'Tentative';
+?>
diff --git a/plugins/calendar/localization/hr_HR.inc b/plugins/calendar/localization/hr_HR.inc
new file mode 100644
index 00000000..f839e408
--- /dev/null
+++ b/plugins/calendar/localization/hr_HR.inc
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['time_format'] = 'Format datuma';
+$labels['first_day'] = 'Prvi dan tjedna';
+$labels['first_hour'] = 'Prvi sat za prikaz';
+$labels['workinghours'] = 'Radni sati';
+$labels['add_category'] = 'Dodaj kategoriju';
+$labels['remove_category'] = 'Obriši kategoriju';
+$labels['defaultcalendar'] = 'Kreiraj nove događaje u';
+$labels['eventcoloring'] = 'Bojanje događaja';
+$labels['coloringmode0'] = 'Prema kalendaru';
+$labels['coloringmode1'] = 'Prema kategoriji';
+$labels['calendar'] = 'Kalendar';
+$labels['calendars'] = 'Kalendari';
+$labels['category'] = 'Kategorija';
+$labels['categories'] = 'Kategorije';
+$labels['status-tentative'] = 'Tentative';
+?>
diff --git a/plugins/calendar/localization/hu_HU.inc b/plugins/calendar/localization/hu_HU.inc
index 3945e824..acc71c9d 100644
--- a/plugins/calendar/localization/hu_HU.inc
+++ b/plugins/calendar/localization/hu_HU.inc
@@ -20,6 +20,7 @@ $labels['coloringmode0'] = 'Naptár szerint';
 $labels['coloringmode1'] = 'Kategória szerint';
 $labels['coloringmode2'] = 'Naptár színe körvonal, kategória színe belsőrész';
 $labels['coloringmode3'] = 'Kategória színe körvonal, naptár színe belsőrész';
+$labels['weeknonone'] = 'soha';
 $labels['calendar'] = 'Naptár';
 $labels['calendars'] = 'Naptárak';
 $labels['category'] = 'Kategória';
@@ -66,6 +67,7 @@ $labels['tentative'] = 'Feltételes';
 $labels['status'] = 'Stát.';
 $labels['status-confirmed'] = 'Confirmed';
 $labels['status-cancelled'] = 'Cancelled';
+$labels['status-tentative'] = 'Feltételes';
 $labels['priority'] = 'Prioritás';
 $labels['sensitivity'] = 'Manánszféra';
 $labels['public'] = 'publikus';
@@ -83,6 +85,7 @@ $labels['printdescriptions'] = 'Leírás nyomtatása';
 $labels['parentcalendar'] = 'Szülőnaptár';
 $labels['searchearlierdates'] = '< Korábbi események keresése';
 $labels['searchlaterdates'] = 'Későbbi események keresése >';
+$labels['laterevents'] = 'Későbbi';
 $labels['andnmore'] = 'még $nr ...';
 $labels['togglerole'] = 'Kattintson a szerepváltáshoz';
 $labels['createfrommail'] = 'Mentés naptári eseményként';
@@ -130,8 +133,6 @@ $labels['availbusy'] = 'Foglalt';
 $labels['availunknown'] = 'Ismeretlen foglaltság';
 $labels['availtentative'] = 'Feltételes';
 $labels['availoutofoffice'] = 'Házon kívül';
-$labels['delegatedto'] = 'Beosztva ide: ';
-$labels['delegatedfrom'] = 'Beosztva innen: ';
 $labels['scheduletime'] = 'Elérhetőség';
 $labels['sendinvitations'] = 'Meghívók küldése';
 $labels['sendnotifications'] = 'Résztvevők értesítése a változásokról';
@@ -142,12 +143,10 @@ $labels['prevslot'] = 'Előző idősáv';
 $labels['nextslot'] = 'Következő idősáv';
 $labels['noslotfound'] = 'Nem sikerült szabad idősávot találni';
 $labels['invitationsubject'] = '$title';
-$labels['invitationmailbody'] = "Meghívó érkezett '\$title' eseményre.\n\nIdőpont: \$date\nSzervező: \$organizer\nRésztvevők: \$attendees\n\n\nMellékletben egy iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
 $labels['invitationattendlinks'] = "Amennyiben a levelezőben nem lát elfogadó/elutasító gombokat (a levelező program nem támogatja az iTip üzeneteket), kattintson ide a meghívó elfogadására, vagy elutasítására:\n\$url";
 $labels['eventupdatesubject'] = '$title - módosítva';
 $labels['eventupdatesubjectempty'] = 'Egy Önt érintő esemény módosítva lett';
 $labels['eventupdatemailbody'] = "Módosítás érkezett '\$title' eseményre vonatkozóan.\n\nIdőpont: \$date\nSzervező: \$organizer\nRésztvevők: \$attendees\n\n\nMellékletben egy frissített iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
-$labels['eventcancelsubject'] = '$title - lemondva';
 $labels['eventcancelmailbody'] = "'\$title' eseményre \$organizer szervező visszavonta a meghívást.\n\nIdőpont: \$date\nRésztvevők: \$attendees\n\n\nMellékletben egy frissített iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
 $labels['itipobjectnotfound'] = 'Az üzenetben hivatkozott esemény nem található a naptárban.';
 $labels['itipmailbodyaccepted'] = "\$sender elfogadta a meghívást '\$title' eseményre.\n\nIdőpont: \$date\nRésztvevők: \$attendees";
diff --git a/plugins/calendar/localization/it_IT.inc b/plugins/calendar/localization/it_IT.inc
index d9b6e54c..ebdf3b89 100644
--- a/plugins/calendar/localization/it_IT.inc
+++ b/plugins/calendar/localization/it_IT.inc
@@ -27,6 +27,7 @@ $labels['afterflagdeleted'] = 'Segna come cancellato';
 $labels['aftermoveto'] = 'Sposta in...';
 $labels['itipoptions'] = 'Inviti all\'evento';
 $labels['afteraction'] = 'Dopo un invito o un aggiornamento il messaggio è processato';
+$labels['weeknonone'] = 'una volta';
 $labels['calendar'] = 'Calendario';
 $labels['calendars'] = 'Calendari';
 $labels['category'] = 'Categoria';
@@ -75,6 +76,7 @@ $labels['mystatus'] = 'Il mio stato';
 $labels['status'] = 'Stato';
 $labels['status-confirmed'] = 'Confermato';
 $labels['status-cancelled'] = 'Cancellato';
+$labels['status-tentative'] = 'Provvisorio';
 $labels['priority'] = 'Priorità';
 $labels['sensitivity'] = 'Privacy';
 $labels['public'] = 'pubblico';
@@ -94,6 +96,7 @@ $labels['printdescriptions'] = 'Stampa descrizioni';
 $labels['parentcalendar'] = 'Inserisci dentro';
 $labels['searchearlierdates'] = '« Cerca eventi precedenti';
 $labels['searchlaterdates'] = 'Cerca eventi successivi »';
+$labels['laterevents'] = 'Dopo';
 $labels['andnmore'] = 'Altri $nr...';
 $labels['togglerole'] = 'Fare clic per cambiare il ruolo';
 $labels['createfrommail'] = 'Salva come evento';
@@ -151,8 +154,6 @@ $labels['availbusy'] = 'Occupato';
 $labels['availunknown'] = 'Sconosciuto';
 $labels['availtentative'] = 'Provvisorio';
 $labels['availoutofoffice'] = 'Fuori sede';
-$labels['delegatedto'] = 'Delegato a:';
-$labels['delegatedfrom'] = 'Delegato da:';
 $labels['scheduletime'] = 'Trova disponibilità';
 $labels['sendinvitations'] = 'Manda inviti';
 $labels['sendnotifications'] = 'Notifica le modifiche ai partecipanti';
@@ -164,12 +165,10 @@ $labels['nextslot'] = 'Spazio successivo';
 $labels['suggestedslot'] = 'Spazio suggerito';
 $labels['noslotfound'] = 'Impossibile trovare uno spazio di tempo libero';
 $labels['invitationsubject'] = 'Sei stato invitato a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nIn allegato un file iCalendar con tutti i dettagli dell'evento, che puoi importare nella tua applicazione calendario.";
 $labels['invitationattendlinks'] = "Se il tuo client di posta elettronica non supporta le richieste iTip, puoi seguire il seguente collegamento per accettare o rifiutare l'invito:\n\$url";
 $labels['eventupdatesubject'] = '"$title" è stato aggiornato';
 $labels['eventupdatesubjectempty'] = 'Un evento che ti riguarda è stato aggiornato';
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nIn allegato un file iCalendar con i dettagli aggiornati dell'evento che puoi importare nella tua applicazione calendario.";
-$labels['eventcancelsubject'] = '"$title" è stato annullato';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nL'evento è stato cancellato da \$organizer.\n\nIn allegato un file iCalendar con i dettagli aggiornati dell'evento .";
 $labels['itipobjectnotfound'] = 'L\'evento al quale questo messaggio fa riferimento non è stato trovato nel tuo calendario.';
 $labels['itipmailbodyaccepted'] = "\$sender ha accettato l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
diff --git a/plugins/calendar/localization/ja_JP.inc b/plugins/calendar/localization/ja_JP.inc
index 3462b3e4..2cd65af0 100644
--- a/plugins/calendar/localization/ja_JP.inc
+++ b/plugins/calendar/localization/ja_JP.inc
@@ -8,6 +8,7 @@
  */
 $labels['default_view'] = 'デフォルトビュー';
 $labels['time_format'] = '時刻表示形式';
+$labels['timeslots'] = '一時間毎のタイムスロット';
 $labels['first_day'] = '最初の平日';
 $labels['first_hour'] = '最初の時間を表示';
 $labels['workinghours'] = '労働時間';
@@ -19,6 +20,14 @@ $labels['coloringmode0'] = 'カレンダーの説明';
 $labels['coloringmode1'] = 'カテゴリの説明';
 $labels['coloringmode2'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
 $labels['coloringmode3'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
+$labels['afternothing'] = '何もしない';
+$labels['aftertrash'] = 'ゴミ箱へ移動';
+$labels['afterdelete'] = 'メッセージを削除';
+$labels['afterflagdeleted'] = '削除フラグ';
+$labels['aftermoveto'] = '移動...';
+$labels['itipoptions'] = 'イベント招待';
+$labels['afteraction'] = '招待もしくは更新の後にメッセージは送達されます';
+$labels['weeknonone'] = '繰返さない';
 $labels['calendar'] = 'カレンダー';
 $labels['calendars'] = 'カレンダー';
 $labels['category'] = 'カテゴリ';
@@ -47,12 +56,15 @@ $labels['all-day'] = '全日';
 $labels['export'] = 'エクスポート';
 $labels['exporttitle'] = 'iカレンダーへエクスポート';
 $labels['exportrange'] = 'イベント元';
+$labels['exportattachments'] = '添付する';
+$labels['customdate'] = 'カスタム日時';
 $labels['location'] = '場所';
 $labels['url'] = 'URL';
 $labels['date'] = '期日';
 $labels['start'] = '開始';
 $labels['starttime'] = '開始時間';
 $labels['end'] = '終了';
+$labels['endtime'] = '終了日';
 $labels['repeat'] = '繰返し';
 $labels['selectdate'] = '日付選択';
 $labels['freebusy'] = '表示する';
@@ -60,8 +72,11 @@ $labels['free'] = '空';
 $labels['busy'] = 'ビジー';
 $labels['outofoffice'] = '外出';
 $labels['tentative'] = '仮';
+$labels['mystatus'] = 'マイ ステータス';
 $labels['status'] = '状態';
+$labels['status-confirmed'] = '確認済';
 $labels['status-cancelled'] = 'キャンセル済';
+$labels['status-tentative'] = '仮';
 $labels['priority'] = '優先度';
 $labels['sensitivity'] = 'プライバシー';
 $labels['public'] = 'パブリック';
@@ -69,6 +84,7 @@ $labels['private'] = 'プライベート';
 $labels['confidential'] = '親展';
 $labels['links'] = '参照';
 $labels['alarms'] = '通知';
+$labels['comment'] = 'コメント';
 $labels['created'] = '作成済';
 $labels['changed'] = '最終変更';
 $labels['unknown'] = '不明';
@@ -80,6 +96,7 @@ $labels['printdescriptions'] = '説明印刷';
 $labels['parentcalendar'] = '内に挿入';
 $labels['searchearlierdates'] = '<< 以前のイベントを検索';
 $labels['searchlaterdates'] = '今後のイベントの検索 >>';
+$labels['laterevents'] = '後で';
 $labels['andnmore'] = '$nr さらに…';
 $labels['togglerole'] = 'クリックでロールをトグル';
 $labels['createfrommail'] = 'イベントとして保存';
@@ -89,8 +106,18 @@ $labels['onemonthback'] = '1 ヶ月戻る';
 $labels['nmonthsback'] = '$nr ヶ月戻る';
 $labels['showurl'] = 'カレンダーURL表示';
 $labels['showurldescription'] = '以下のアドレスを使用して他のアプリケーションからカレンダーにアクセス(読込のみ)できます。iCal形式をサポートしたカレンダーソフトウェアへコピーアンドペーストができます。';
+$labels['caldavurldescription'] = 'この指定したカレンダーをコンピュータもしくはモバイルデバイスと全同期するためにはこのアドレスを <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> クライアントアプリケーション(たとえばエボリューションやMozilla サンダーバード)へコピーしてください。';
+$labels['findcalendars'] = 'カレンダーの検索';
 $labels['searchterms'] = '用語検索';
+$labels['calsearchresults'] = '有効なカレンダー';
 $labels['calendarsubscribe'] = '持続的なもののリスト';
+$labels['nocalendarsfound'] = 'カレンダーが見つかりませんでした';
+$labels['nrcalendarsfound'] = '$nr カレンダーが見つかりました';
+$labels['quickview'] = 'このカレンダーは閲覧のみ';
+$labels['invitationspending'] = '保留中の招待';
+$labels['invitationsdeclined'] = '断った招待';
+$labels['changepartstat'] = '参加者のステータス変更';
+$labels['rsvpcomment'] = '招待テキスト';
 $labels['listrange'] = '表示範囲:';
 $labels['listsections'] = '分割:';
 $labels['smartsections'] = 'スマートセクション';
@@ -99,6 +126,7 @@ $labels['today'] = '今日';
 $labels['tomorrow'] = '明日';
 $labels['thisweek'] = '今週';
 $labels['nextweek'] = '来週';
+$labels['prevweek'] = '前週';
 $labels['thismonth'] = '今月';
 $labels['nextmonth'] = '来月';
 $labels['weekofyear'] = '週';
@@ -116,8 +144,11 @@ $labels['roleorganizer'] = '編成者';
 $labels['rolerequired'] = '要件';
 $labels['roleoptional'] = 'オプション';
 $labels['rolechair'] = '議長';
+$labels['rolenonparticipant'] = '欠席';
+$labels['cutypeindividual'] = '個人';
 $labels['cutypegroup'] = 'グループ';
 $labels['cutyperesource'] = 'リソース';
+$labels['cutyperoom'] = 'ルーム';
 $labels['availfree'] = '空';
 $labels['availbusy'] = 'ビジー';
 $labels['availunknown'] = '不明';
@@ -131,24 +162,40 @@ $labels['onlyworkinghours'] = '労働時間内の利用可検索';
 $labels['reqallattendees'] = '要件/全参加者';
 $labels['prevslot'] = '前のスロット';
 $labels['nextslot'] = '次のスロット';
+$labels['suggestedslot'] = '指示されたスロット';
 $labels['noslotfound'] = '空スロットを見つけられません';
 $labels['invitationsubject'] = '"$title" に招待されました';
-$labels['invitationmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできる全イベントの詳細がインポートできる添付されたiカレンダーファイルを見つけてください。";
 $labels['invitationattendlinks'] = "この場合あなたのメールクライアントはiTip リクエストをサポートしてません、以下のリンクからこの招待を承諾もしくは辞退してください:\n\$url";
 $labels['eventupdatesubject'] = '"$title" はアップデートされました';
 $labels['eventupdatesubjectempty'] = 'あなたに関連するイベントが更新されました';
 $labels['eventupdatemailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできるアップデートされた全イベントの詳細が添付されたiカレンダーファイルを見つけてください。";
-$labels['eventcancelsubject'] = '"$title" は変更されました';
 $labels['eventcancelmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nイベントが \$organizer によってキャンセルされました。\n\n更新されたイベントの詳細とともに添付されたiカレンダーファイルを見つけてください。";
+$labels['itipobjectnotfound'] = 'このメッセージから参照されるイベントはカレンダーには見つかりません。';
 $labels['itipmailbodyaccepted'] = "\$sender は以下のイベントへの招待を承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender は以下のイベントへの招待を仮承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender は以下のイベントへの招待を辞退しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender は以下のイベントへの参加を断りました:\n\n*\$title*\n\nいつ: \$date";
+$labels['itipmailbodydelegated'] = "\$sender は以下のイベントへの参加を委任しました:\n\n*\$title*\n\nいつ: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender は以下のイベントへの参加をあなたへ委任しました:\n\n*\$title*\n\nいつ: \$date";
 $labels['itipdeclineevent'] = 'このイベントへの招待を辞退しますか?';
+$labels['declinedeleteconfirm'] = 'この断ったイベントもカレンダーから削除しますか?';
+$labels['itipcomment'] = '招待/通知コメント';
+$labels['itipcommenttitle'] = 'このコメントは参加者へ送られた招待/通知メッセージへ添付されます';
 $labels['notanattendee'] = 'このイベントの出席者として一覧にありません';
 $labels['eventcancelled'] = 'このイベントはキャンセルされました';
 $labels['saveincalendar'] = '保存';
+$labels['updatemycopy'] = 'マイカレンダーの更新';
+$labels['savetocalendar'] = 'カレンダーへ保存';
+$labels['openpreview'] = 'カレンダーにチェック';
+$labels['noearlierevents'] = '以前のイベントはありません';
+$labels['nolaterevents'] = '以降のイベントはありません';
 $labels['resource'] = 'リソース';
+$labels['addresource'] = 'リソースの記帳';
+$labels['findresources'] = 'リソースの検索';
 $labels['resourcedetails'] = '詳細';
+$labels['resourceavailability'] = '利用可';
+$labels['resourceowner'] = '所有者';
+$labels['resourceadded'] = 'リソースはイベントへ追加されました';
 $labels['tabsummary'] = '要約';
 $labels['tabrecurrence'] = '繰返し';
 $labels['tabattendees'] = '参加者';
@@ -158,6 +205,7 @@ $labels['tabsharing'] = '共有';
 $labels['deleteobjectconfirm'] = '本当にこのイベントを削除しますか?';
 $labels['deleteventconfirm'] = '本当にこのイベントを削除しますか?';
 $labels['deletecalendarconfirm'] = '本当にこのカレンダーを全イベントとともに削除しますか?';
+$labels['deletecalendarconfirmrecursive'] = 'このカレンダーとカレンダー内のすべてのイベントやサブカレンダーを削除しますか?';
 $labels['savingdata'] = 'データを保存中…';
 $labels['errorsaving'] = '変更が保存できませんでした。';
 $labels['operationfailed'] = '要求された操作ができませんでした。';
@@ -168,27 +216,52 @@ $labels['successremoval'] = 'イベントを削除しました';
 $labels['successrestore'] = 'イベントを復旧しました';
 $labels['errornotifying'] = 'イベント参加者への通知が送信できませんでした';
 $labels['errorimportingevent'] = 'イベントのインポートができませんでした';
+$labels['importwarningexists'] = 'このイベントのコピーはすでにカレンダーにあります。';
 $labels['newerversionexists'] = 'このイベントのより新しいヴァージョンがすでにあります。中断されました。';
 $labels['nowritecalendarfound'] = 'イベントを保存するカレンダーが見つかりません';
 $labels['importedsuccessfully'] = '\'$calendar\' へイベントを追加しました';
+$labels['updatedsuccessfully'] = '\'$calendar\' 内のイベントの更新に成功しました';
 $labels['attendeupdateesuccess'] = '出席者状況を更新しました';
 $labels['itipsendsuccess'] = '出席者へ招待を送信しました。';
 $labels['itipresponseerror'] = 'この招待の返信できませんでした';
 $labels['itipinvalidrequest'] = 'この招待は間もなく無効になります';
 $labels['sentresponseto'] = '$mailto への招待の返信しました';
+$labels['localchangeswarning'] = 'あなたのカレンダーにのみ反映されイベントのまとめ役に通知されない変更を行おうとしています';
 $labels['importsuccess'] = '$nr イベントをインポートしました';
 $labels['importnone'] = 'インポートされたイベントはありません';
 $labels['importerror'] = 'インポート中にエラーが発生しました。';
 $labels['aclnorights'] = 'このカレンダーの管理権限がありません。';
 $labels['changeeventconfirm'] = 'イベント変更';
+$labels['removeeventconfirm'] = 'イベントを削除';
 $labels['changerecurringeventwarning'] = 'これは繰返しイベントです。現在のイベントのみ、このイベントと今後の全イベント、全イベント、編集したい、もしくは新しいイベントとして保存したい?';
+$labels['removerecurringeventwarning'] = 'これは繰返しのイベントです。現在のイベントのみ削除しますか? これと将来のすべてのイベントを削除しますか? または全てを削除しますか?';
+$labels['removerecurringallonly'] = 'これは繰返しイベントです。参加者は全ての出来事に対して参加のみを取り消せます。';
 $labels['currentevent'] = '現在';
 $labels['futurevents'] = '今後';
 $labels['allevents'] = '全て';
 $labels['saveasnew'] = '新規保存';
+$labels['birthdays'] = '誕生日';
+$labels['birthdayscalendar'] = '誕生日カレンダー';
+$labels['displaybirthdayscalendar'] = '誕生日をカレンダーに表示';
+$labels['birthdayscalendarsources'] = 'これらのアドレス帳から';
+$labels['birthdayeventtitle'] = '$name さんの誕生日';
+$labels['birthdayage'] = '年齢 $age';
 $labels['objectchangelog'] = '変更履歴';
 $labels['objectdiff'] = '$rev1 から $rev2 への変更';
+$labels['objectnotfound'] = 'イベントデータのロードに失敗しました';
+$labels['objectchangelognotavailable'] = 'このイベントの更新履歴は利用できません';
 $labels['objectdiffnotavailable'] = '選択されたリビジョンでは比較できません';
+$labels['revisionrestoreconfirm'] = '本当にリビジョン $rev のイベントを復旧しますか? 現在のイベントは古いバージョンのイベントに置換えられます。';
 $labels['objectrestoresuccess'] = 'リビジョン $rev は復旧されました';
 $labels['objectrestoreerror'] = '古いバージョンの復旧に失敗しました';
+$labels['arialabelminical'] = 'カレンダー日付選択';
+$labels['arialabelcalendarview'] = 'カレンダー表示';
+$labels['arialabelsearchform'] = 'イベント検索元';
+$labels['arialabelquicksearchbox'] = 'イベント検索入力';
+$labels['arialabelcalsearchform'] = 'カレンダー検索元';
+$labels['calendaractions'] = '行事カレンダー';
+$labels['arialabeleventattendees'] = 'イベント参加者リスト';
+$labels['arialabeleventresources'] = 'イベントリソースリスト';
+$labels['arialabelresourcesearchform'] = 'リソース検索元';
+$labels['arialabelresourceselection'] = '利用可能なリソース';
 ?>
diff --git a/plugins/calendar/localization/ko_KR.inc b/plugins/calendar/localization/ko_KR.inc
new file mode 100644
index 00000000..456e560b
--- /dev/null
+++ b/plugins/calendar/localization/ko_KR.inc
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = '기본 보기';
+$labels['time_format'] = '시간표시 형식';
+$labels['timeslots'] = '시간당 슬롯';
+$labels['first_day'] = '첫번째 평일';
+$labels['first_hour'] = '표시시작 시각';
+$labels['workinghours'] = '근무시간';
+$labels['add_category'] = '카테고리 추가';
+$labels['remove_category'] = '카테고리 삭제';
+$labels['defaultcalendar'] = '새 일정 추가';
+$labels['eventcoloring'] = '일정 색상';
+$labels['coloringmode0'] = '일정에 따라';
+$labels['coloringmode1'] = '카테고리에 따라';
+$labels['afternothing'] = '그대로 둠';
+$labels['aftertrash'] = '휴지통에 버림';
+$labels['afterdelete'] = '메세지 삭제';
+$labels['afterflagdeleted'] = '삭제로 표시';
+$labels['aftermoveto'] = '이동';
+$labels['itipoptions'] = '일정에 초대';
+$labels['calendar'] = '캘린더';
+$labels['calendars'] = '캘린더';
+$labels['category'] = '카테고리';
+$labels['categories'] = '카테고리';
+$labels['createcalendar'] = '새 캘린더 추가';
+$labels['editcalendar'] = '캘린더 설정';
+$labels['name'] = '이름';
+$labels['color'] = '색상';
+$labels['day'] = '일';
+$labels['week'] = '주';
+$labels['month'] = '월';
+$labels['agenda'] = '일정목록';
+$labels['new'] = '신규';
+$labels['new_event'] = '새 일정';
+$labels['edit_event'] = '일정 수정';
+$labels['edit'] = '수정';
+$labels['save'] = '저장';
+$labels['removelist'] = '목록에서 삭제';
+$labels['cancel'] = '취소';
+$labels['select'] = '선택';
+$labels['print'] = '인쇄';
+$labels['printtitle'] = '캘린더 인쇄';
+$labels['title'] = '요약';
+$labels['description'] = '설명';
+$labels['all-day'] = '종일';
+$labels['export'] = '내보내기';
+$labels['exporttitle'] = 'iCalendar로 내보내기';
+$labels['exportattachments'] = '첨부됨';
+$labels['location'] = '위치';
+$labels['url'] = 'URL';
+$labels['date'] = '날짜';
+$labels['start'] = '시작';
+$labels['starttime'] = '시작 시간';
+$labels['end'] = '종료';
+$labels['endtime'] = '종료 시간';
+$labels['repeat'] = '반복';
+$labels['selectdate'] = '날짜 선택';
+$labels['free'] = '한가함';
+$labels['busy'] = '바쁨';
+$labels['outofoffice'] = '부재중';
+$labels['tentative'] = '임시';
+$labels['mystatus'] = '내 상태';
+$labels['status'] = '상태';
+$labels['status-confirmed'] = '확인됨';
+$labels['status-cancelled'] = '취소됨';
+$labels['status-tentative'] = '임시';
+$labels['priority'] = '우선순위';
+$labels['sensitivity'] = '프라이버시';
+$labels['public'] = '공개';
+$labels['private'] = '비공개';
+$labels['confidential'] = '비밀';
+$labels['links'] = '참조';
+$labels['alarms'] = '알림';
+$labels['comment'] = '코멘트';
+$labels['created'] = '작성됨';
+$labels['changed'] = '마지막으로 수정됨';
+$labels['unknown'] = '알 수 없는';
+$labels['eventoptions'] = '옵션';
+$labels['generated'] = '생성된';
+$labels['eventhistory'] = '이력';
+$labels['printdescriptions'] = '내용 출력';
+$labels['searchearlierdates'] = '이전 일정 검색';
+$labels['searchlaterdates'] = '이후 일정 검색';
+$labels['andnmore'] = '$nr 더...';
+$labels['createfrommail'] = '일정으로 저장';
+$labels['importevents'] = '일정 가져오기';
+$labels['onemonthback'] = '한달 전';
+$labels['nmonthsback'] = '$nr개월 전';
+$labels['showurl'] = '캘린더 URL 보이기';
+$labels['findcalendars'] = '캘린더 검색';
+$labels['calsearchresults'] = '가능한 캘린더';
+$labels['nocalendarsfound'] = '캘린더 없음';
+$labels['nrcalendarsfound'] = '$nr개의 캘린더 검색됨';
+$labels['quickview'] = '이 캘린더만 보기';
+$labels['invitationspending'] = '보류중인 초대장';
+$labels['invitationsdeclined'] = '거절된 초대장';
+$labels['changepartstat'] = '참가상태 변경';
+$labels['rsvpcomment'] = '초대 문구';
+$labels['listrange'] = '표시 범위';
+$labels['listsections'] = '분류 :';
+$labels['smartsections'] = '스마트 선택';
+$labels['until'] = '까지';
+$labels['today'] = '오늘';
+$labels['tomorrow'] = '내일';
+$labels['thisweek'] = '이번 주';
+$labels['nextweek'] = '다음 주';
+$labels['prevweek'] = '지난 주';
+$labels['thismonth'] = '이번 달';
+$labels['nextmonth'] = '다음 달';
+$labels['weekofyear'] = '주';
+$labels['pastevents'] = '과거';
+$labels['futureevents'] = '미래';
+$labels['showalarms'] = '알림 보이기';
+$labels['defaultalarmtype'] = '기본 알림 설정';
+$labels['defaultalarmoffset'] = '기본 알림 시간';
+$labels['attendee'] = '참가자';
+$labels['availability'] = '가능';
+$labels['confirmstate'] = '상태';
+$labels['addattendee'] = '참가자 추가';
+$labels['roleorganizer'] = '주최자';
+$labels['rolerequired'] = '필수';
+$labels['roleoptional'] = '선택';
+$labels['rolechair'] = '좌석';
+$labels['rolenonparticipant'] = '불참';
+$labels['cutypeindividual'] = '개인';
+$labels['cutypegroup'] = '그룹';
+$labels['cutyperesource'] = '자원';
+$labels['availfree'] = '한가함';
+$labels['availbusy'] = '바쁨';
+$labels['availunknown'] = '알 수 없는';
+$labels['availtentative'] = '임시';
+$labels['availoutofoffice'] = '부재중';
+$labels['scheduletime'] = '가능여부 확인';
+$labels['sendinvitations'] = '초대장 보내기';
+$labels['sendnotifications'] = '변경 사항을 참가자에게 알림';
+$labels['sendcancellation'] = '일정 취소에 대해 참가자에게 알림';
+$labels['onlyworkinghours'] = '근무시간내 가능여부 확인';
+$labels['prevslot'] = '이전 슬롯';
+$labels['nextslot'] = '다음 슬롯';
+$labels['noslotfound'] = '여유 시간 슬롯을 찾을 수 없습니다.';
+$labels['invitationsubject'] = '"$title"에 초대되었습니다';
+$labels['invitationattendlinks'] = "당신과 관련된 이벤트가 업데이트되었습니다";
+$labels['itipobjectnotfound'] = '이 메시지와 관련된 일정을 캘린더에서 찾을 수 없습니다.';
+$labels['itipdeclineevent'] = '이 일정에 초대를 거절할까요?';
+$labels['declinedeleteconfirm'] = '당신이 당신의 달력에서 이벤트를 사퇴 삭제 하시겠습니까?';
+$labels['itipcommenttitle'] = '이 댓글은 참가자들에게 보낸 초대장 / 알림 메시지에 첨부됩니다';
+$labels['notanattendee'] = '당신은 이 일정의 참여자 목록에 없습니다';
+$labels['eventcancelled'] = '일정이 취소되었습니다';
+$labels['savetocalendar'] = '캘린더에 저장';
+$labels['openpreview'] = '캘린더 검토';
+$labels['noearlierevents'] = '이전 일정이 없습니다';
+$labels['nolaterevents'] = '이후 일정이 없습니다';
+$labels['resource'] = '자원';
+$labels['tabsummary'] = '요약';
+$labels['tabrecurrence'] = '반복';
+$labels['tabattendees'] = '참가자';
+$labels['deleteobjectconfirm'] = '이 일정을 정말 삭제 하시겠습니까?';
+$labels['deleteventconfirm'] = '이 일정을 정말 삭제 하시겠습니까?';
+$labels['deletecalendarconfirm'] = '이 캘린더와 포함된 모든 일정을 정말 삭제하겠습니까?';
+$labels['deletecalendarconfirmrecursive'] = '이 캘린더와 포함된 모든 일정 및 하위 캘린더를 정말 삭제하겠습니까?';
+$labels['savingdata'] = '자료 저장중...';
+$labels['errorsaving'] = '변경내역을 저장하지 못하였습니다.';
+$labels['operationfailed'] = '요청한 작업을 실패하였습니다.';
+$labels['invalideventdates'] = '잘못된 날짜가 입력되었습니다! 입력값을 확인하십시오.';
+$labels['invalidcalendarproperties'] = '잘못된 달력 속성입니다! 올바른 이름을 설정하십시오.';
+$labels['searchnoresults'] = '선택한 달력에는 아무런 일정도 없습니다.';
+$labels['successremoval'] = '일정이 정상적으로 삭제되었습니다.';
+$labels['successrestore'] = '일정이 정상적으로 복구되었습니다.';
+$labels['errornotifying'] = '일정 참가자에게 알림을 보낼 수 없습니다.';
+$labels['errorimportingevent'] = '일정을 가지오지 못하였습니다.';
+$labels['importwarningexists'] = '캘린더에 이미 동일한 일정이 존재합니다.';
+$labels['newerversionexists'] = '최근에 수정한 내용이 이미 저장되어 있습니다. 작업이 취소되었습니다.';
+$labels['nowritecalendarfound'] = '일정을 저장할 캘린더가 없습니다';
+$labels['itipinvalidrequest'] = '이 초대장은 더이상 유효하지 않습니다';
+$labels['importnone'] = '가져올 일정이 없습니다';
+$labels['importerror'] = '가져오는 도중 오류가 발생했습니다';
+$labels['aclnorights'] = '이 캘린더에 대한 관리권한이 없습니다.';
+$labels['changeeventconfirm'] = '일정 변경';
+$labels['removeeventconfirm'] = '일정 삭제';
+$labels['currentevent'] = '현재';
+$labels['futurevents'] = '미래';
+$labels['allevents'] = '전체';
+$labels['saveasnew'] = '새로 저장';
+$labels['birthdays'] = '생일';
+$labels['birthdayscalendar'] = '생일 캘린더';
+$labels['displaybirthdayscalendar'] = '생일 캘린더 표시';
+$labels['birthdayscalendarsources'] = '주소록에서';
+$labels['birthdayeventtitle'] = '$name의 생일';
+$labels['birthdayage'] = '$age세';
+$labels['objectnotfound'] = '일정 데이터를 읽지 못하였습니다';
+$labels['objectrestoreerror'] = '이전 버전으로 복구하지 못하였습니다';
+$labels['arialabelcalendarview'] = '캘린더 보기';
+$labels['arialabelsearchform'] = '일정 검색 폼';
+$labels['arialabelquicksearchbox'] = '일정 검색 항목';
+$labels['arialabelcalsearchform'] = '캘린더 검색 폼';
+?>
diff --git a/plugins/calendar/localization/lv.inc b/plugins/calendar/localization/lv.inc
new file mode 100644
index 00000000..cecc3332
--- /dev/null
+++ b/plugins/calendar/localization/lv.inc
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = 'Noklusētais skats';
+$labels['time_format'] = 'Laika formāts';
+$labels['timeslots'] = 'Iedaļu skaits stundā';
+$labels['first_day'] = 'Nedēļas sākuma diena';
+$labels['first_hour'] = 'Pirmā attēlojamā stunda';
+$labels['workinghours'] = 'Darba laiks';
+$labels['add_category'] = 'Pievienot kategoriju';
+$labels['remove_category'] = 'Dzēst kategoriju';
+$labels['defaultcalendar'] = 'Veidot jaunus notikumus kalendārā';
+$labels['eventcoloring'] = 'Iekrāsot notikumus';
+$labels['coloringmode0'] = 'Kalendāra krāsā';
+$labels['coloringmode1'] = 'Kategorijas krāsā';
+$labels['coloringmode2'] = 'Kalendāra krāsa līnijai, kategorijas krāsa pildījumam';
+$labels['coloringmode3'] = 'Kategorijas krāsa līnijai, kalendāra krāsa pildījumam';
+$labels['afternothing'] = 'Nedarīt neko';
+$labels['aftertrash'] = 'Pārvietot uz Papīrgrozu';
+$labels['afterdelete'] = 'Dzēst ziņojumu';
+$labels['afterflagdeleted'] = 'Atzīmēt kā dzēstu';
+$labels['aftermoveto'] = 'Pārvietot uz ...';
+$labels['itipoptions'] = 'Notikuma uzaicinājumi';
+$labels['afteraction'] = 'Pēc tam, kad uzaicinājums vai izmaiņu ziņojums ir apstrādāts';
+$labels['weeknonone'] = 'nekad';
+$labels['calendar'] = 'Kalendārs';
+$labels['calendars'] = 'Kalendāri';
+$labels['category'] = 'Kategorija';
+$labels['categories'] = 'Kategorijas';
+$labels['createcalendar'] = 'Jauns kalendārs';
+$labels['editcalendar'] = 'Kalendāra īpašības';
+$labels['name'] = 'Nosaukums';
+$labels['color'] = 'Krāsa';
+$labels['day'] = 'Diena';
+$labels['week'] = 'Nedēļa';
+$labels['month'] = 'Mēnesis';
+$labels['agenda'] = 'Dienaskārtība';
+$labels['new'] = 'Jauns';
+$labels['new_event'] = 'Jauns notikums';
+$labels['edit_event'] = 'Mainīt notikumu';
+$labels['edit'] = 'Labot';
+$labels['save'] = 'Saglabāt';
+$labels['removelist'] = 'Dzēst no saraksta';
+$labels['cancel'] = 'Atcelt';
+$labels['select'] = 'Izvēlēties';
+$labels['print'] = 'Drukāt';
+$labels['printtitle'] = 'Drukāt kalendārus';
+$labels['title'] = 'Kopsavilkums';
+$labels['description'] = 'Apraksts';
+$labels['all-day'] = 'visa diena';
+$labels['export'] = 'Eksportēt';
+$labels['exporttitle'] = 'Eksportēt uz iCalendar';
+$labels['exportrange'] = 'Notikumi no';
+$labels['exportattachments'] = 'Ar pielikumiem';
+$labels['customdate'] = 'Lietotāja izvēlēts datums';
+$labels['location'] = 'Vieta';
+$labels['url'] = 'URL';
+$labels['date'] = 'Datums';
+$labels['start'] = 'Sākums';
+$labels['starttime'] = 'Sākums';
+$labels['end'] = 'Beigas';
+$labels['endtime'] = 'Beigas';
+$labels['repeat'] = 'Atkārtot';
+$labels['selectdate'] = 'Izvēlieties datumu';
+$labels['freebusy'] = 'Rādīt mani kā';
+$labels['free'] = 'Brīvs';
+$labels['busy'] = 'Aizņemts';
+$labels['outofoffice'] = 'Ārpus biroja';
+$labels['tentative'] = 'Varbūt';
+$labels['mystatus'] = 'Mans statuss';
+$labels['status'] = 'Statuss';
+$labels['status-confirmed'] = 'Apstiprināts';
+$labels['status-cancelled'] = 'Atcelts';
+$labels['status-tentative'] = 'Varbūt';
+$labels['priority'] = 'Prioritāte';
+$labels['sensitivity'] = 'Privātums';
+$labels['public'] = 'publisks';
+$labels['private'] = 'privāts';
+$labels['confidential'] = 'slepens';
+$labels['links'] = 'Atsauce';
+$labels['alarms'] = 'Atgādinājums';
+$labels['comment'] = 'Komentārs';
+$labels['created'] = 'Izveidots';
+$labels['changed'] = 'Mainīts';
+$labels['unknown'] = 'Nezināms';
+$labels['eventoptions'] = 'iespējas';
+$labels['generated'] = 'izveidots';
+$labels['eventhistory'] = 'Vēsture';
+$labels['removelink'] = 'Noņemt atsauci uz e-pastu';
+$labels['printdescriptions'] = 'Drukāt aprakstus';
+$labels['parentcalendar'] = 'Ievietot';
+$labels['searchearlierdates'] = '« Meklēt agrākus notikumus';
+$labels['searchlaterdates'] = 'Meklēt vēlākus notikumus »';
+$labels['andnmore'] = 'vēl $nr ...';
+$labels['togglerole'] = 'Uzklikšķiniet, lai pārslēgtu lomu';
+$labels['createfrommail'] = 'Saglabāt kā notikumu';
+$labels['importevents'] = 'Importēt notikumus';
+$labels['importrange'] = 'Notikumi no';
+$labels['onemonthback'] = 'Pirms mēneša';
+$labels['nmonthsback'] = 'Pirms $nr mēnešiem';
+$labels['showurl'] = 'Parādīt kalendāra URL';
+$labels['showurldescription'] = 'Izmantojiet sekojošo adresi, lai piekļūtu (tikai lasīšanas režīmā) jūsu kalendāram no citas aplikācijas. Jūs varat to nokopēt un ielīmēt jebkurā aplikācijā, kas atbalsta iCal formātu.';
+$labels['caldavurldescription'] = 'Nokopējiet šo adresi <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> uz klienta aplikāciju (piem. Evolution vai Mozilla Thunderbird) lai pilnībā sinhronizētu izvēlēto kalendāru ar jūsu datoru vai mobilo ierīci.';
+$labels['findcalendars'] = 'Meklēt kalendārus...';
+$labels['searchterms'] = 'Meklēšanas nosacījumi';
+$labels['calsearchresults'] = 'Pieejamie kalendāri';
+$labels['calendarsubscribe'] = 'Rādīt sarakstā vienmēr';
+$labels['nocalendarsfound'] = 'Neviens kalendārs nav atrasts';
+$labels['nrcalendarsfound'] = 'Atrasti $nr kalendāri';
+$labels['quickview'] = 'Skatīt tikai šo kalendāru';
+$labels['invitationspending'] = 'Neapstrādātie uzaicinājumi';
+$labels['invitationsdeclined'] = 'Noraidītie uzaicinājumi';
+$labels['changepartstat'] = 'Mainīt dalībnieka statusu';
+$labels['rsvpcomment'] = 'Uzaicinājuma teksts';
+$labels['listrange'] = 'Attēlot diapazonu:';
+$labels['listsections'] = 'Sadalīt:';
+$labels['smartsections'] = 'Viedās sekcijas';
+$labels['until'] = 'līdz';
+$labels['today'] = 'Šodien';
+$labels['tomorrow'] = 'Rīt';
+$labels['thisweek'] = 'Šonedēļ';
+$labels['nextweek'] = 'Jaunnedēļ';
+$labels['prevweek'] = 'Pagājušā nedēļā';
+$labels['thismonth'] = 'Šomēnes';
+$labels['nextmonth'] = 'Nākošmēnes';
+$labels['weekofyear'] = 'Nedēļa';
+$labels['pastevents'] = 'Pagātne';
+$labels['futureevents'] = 'Nākotne';
+$labels['showalarms'] = 'Rādīt atgādinājumus';
+$labels['defaultalarmtype'] = 'Noklusētais atgādinājumu uzstādījums';
+$labels['defaultalarmoffset'] = 'Noklusētais atgādinājuma laiks';
+$labels['attendee'] = 'Dalībnieks';
+$labels['role'] = 'Loma';
+$labels['availability'] = 'Pieej.';
+$labels['confirmstate'] = 'Statuss';
+$labels['addattendee'] = 'Pievienot dalībnieku';
+$labels['roleorganizer'] = 'Organizētājs';
+$labels['rolerequired'] = 'Obligāti';
+$labels['roleoptional'] = 'Pēc izvēles';
+$labels['rolechair'] = 'Vadītājs';
+$labels['rolenonparticipant'] = 'Nepiedalās';
+$labels['cutypeindividual'] = 'Persona';
+$labels['cutypegroup'] = 'Grupa';
+$labels['cutyperesource'] = 'Resurss';
+$labels['cutyperoom'] = 'Telpa';
+$labels['availfree'] = 'Brīvs';
+$labels['availbusy'] = 'Aizņemts';
+$labels['availunknown'] = 'Nezināms';
+$labels['availtentative'] = 'Varbūt';
+$labels['availoutofoffice'] = 'Ārpus biroja';
+$labels['scheduletime'] = 'Atrast brīvu laiku';
+$labels['sendinvitations'] = 'Nosūtīt uzaicinājumus';
+$labels['sendnotifications'] = 'Apziņot dalībniekus par izmaiņām';
+$labels['sendcancellation'] = 'Apziņot dalībniekus par pasākuma atcelšanu';
+$labels['onlyworkinghours'] = 'Atrast brīvu laiku manā darba laikā';
+$labels['reqallattendees'] = 'Obligātie/visi dalībnieki';
+$labels['prevslot'] = 'Iepriekšējā iedaļa';
+$labels['nextslot'] = 'Nākamā iedaļa';
+$labels['suggestedslot'] = 'Ieteicamā iedaļa';
+$labels['noslotfound'] = 'Nav brīvas laika iedaļas';
+$labels['invitationsubject'] = 'Jūs esat uzaicināts uz "$title"';
+$labels['invitationattendlinks'] = "Gadījumā ja jūsu e-pasta praogramma neatbalsta iTip pieprasījumus, tad jūs varat izmantot šo saiti, lai pieņemtu vai noraidītu šo uzaicinājumu:\n\$url";
+$labels['eventupdatesubject'] = '"$title" ir mainīts';
+$labels['eventupdatesubjectempty'] = 'Pasākums, kas attiecas uz jums ir mainīts';
+$labels['eventupdatemailbody'] = "*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees\n\nPielikumā pievienots iCalendar fails ar atjaunotu notikuma informāciju, kuru jūs varat importēt savā kalendāra aplikācijā.";
+$labels['eventcancelsubject'] = '"$title" ir atcelts';
+$labels['eventcancelmailbody'] = "*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees\n\nPasākumu ir atcēlis tā organizators \$organizer.\n\nLūdzu skatiet pievienoto iCalendar failu ar atjaunotu notikuma informāciju.";
+$labels['itipobjectnotfound'] = 'Notikums uz ko attiecas šis ziņojums nav atrodams jūsu kalendāra.';
+$labels['itipmailbodyaccepted'] = "\$sender ir pieņēmis uzaicinājumu uz:\n\n*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender ir noraidījis uzaicinājumu dalībai:\n\n*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender ir noraidījis jūsu dalību sekojošā pasākumā:\n\n*\$title*\n\nKad: \$date";
+$labels['itipmailbodydelegated'] = "\$sender ir deleģējis dalību sekojošā pasākumā:\n\n*\$title*\n\nKad: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ir deleģējis jums dalību sekojošā pasākumā:\n\n*\$title*\n\nKad: \$date";
+$labels['itipdeclineevent'] = 'Vai vēlaties noraidīt šo uzaicinājumu?';
+$labels['declinedeleteconfirm'] = 'Vai jūs vēlaties arī dzēst šo noraidīto notikumu no jūsu kalendāra?';
+$labels['itipcomment'] = 'Uzaicinājumam/paziņojuma komentārs';
+$labels['itipcommenttitle'] = 'Šis komentārs tiks pievienots uzaicinājumam/paziņojuma ziņojumam dalībniekiem';
+$labels['notanattendee'] = 'Jūs neesat šī notikuma dalībnieku sarakstā';
+$labels['eventcancelled'] = 'Notikums atcelts';
+$labels['saveincalendar'] = 'saglabāt';
+$labels['updatemycopy'] = 'Atjaunot manā kalendārā';
+$labels['savetocalendar'] = 'Saglabāt kalendārā';
+$labels['openpreview'] = 'Pārbaudīt kalendāru';
+$labels['noearlierevents'] = 'Nav notikumu pirms';
+$labels['nolaterevents'] = 'Nav notikumu pēc';
+$labels['resource'] = 'Resurss';
+$labels['addresource'] = 'Pieteikt resursus';
+$labels['findresources'] = 'Meklēt resursus';
+$labels['resourcedetails'] = 'Detaļas';
+$labels['resourceavailability'] = 'Pieejamība';
+$labels['resourceowner'] = 'Īpašnieks';
+$labels['resourceadded'] = 'Resursi pievienoti jūsu notikumam';
+$labels['tabsummary'] = 'Kopsavilkums';
+$labels['tabrecurrence'] = 'Atkārtojums';
+$labels['tabattendees'] = 'Dalībnieki';
+$labels['tabresources'] = 'Resursi';
+$labels['tabattachments'] = 'Pielikumi';
+$labels['tabsharing'] = 'Dalīšanās';
+$labels['deleteobjectconfirm'] = 'Vai tiešām jūs vēlaties dzēst šo notikumu?';
+$labels['deleteventconfirm'] = 'Vai tiešām jūs vēlaties dzēst šo notikumu?';
+$labels['deletecalendarconfirm'] = 'Vai tiešām jūs vēlaties dzēst šo kalendāru ar visiem notikumiem?';
+$labels['deletecalendarconfirmrecursive'] = 'Vai tiešām jūs vēlaties dzēst šo kalendāru ar visiem notikumiem un pakārtotajiem kalendāriem?';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['errorsaving'] = 'Kļūda saglabājot izmaiņas.';
+$labels['operationfailed'] = 'Kļūda pieprasītās darbības laikā.';
+$labels['invalideventdates'] = 'Ievadīti nederīgi datumi! Lūdzu pārbaudiet ievadīto.';
+$labels['invalidcalendarproperties'] = 'Nederīgas kalendāra īpašības! Lūdzu norādiet derīgu nosaukumu.';
+$labels['searchnoresults'] = 'Nav atrasts neviens notikums izvēlētajos kalendāros';
+$labels['successremoval'] = 'Notikums veiksmīgi dzēsts';
+$labels['successrestore'] = 'Notikums veiksmīgi atjaunots';
+$labels['errornotifying'] = 'Kļūda izsūtot paziņojumus dalībniekiem';
+$labels['errorimportingevent'] = 'Kļūda importējot notikumu';
+$labels['importwarningexists'] = 'Šī notikuma kopija jau eksistē jūsu kalendārā';
+$labels['newerversionexists'] = 'Jaunāka notikuma versija jau eksistē jūsu kalendārā! Darbība atcelta.';
+$labels['nowritecalendarfound'] = 'Nav atrasts kalendārs, kur pievienot notikumu';
+$labels['importedsuccessfully'] = 'Šis notikums veiksmīgi pievienots kalendāram \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Šis notikums veiksmīgi atjaunots kalendārā \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Dalībnieku statusi veiksmīgi atjaunoti';
+$labels['itipsendsuccess'] = 'Uzaicinājumi dalībniekiem izsūtīti';
+$labels['itipresponseerror'] = 'Kļūda nosūtot atbildi uz šo uzaicinājumu';
+$labels['itipinvalidrequest'] = 'Šis uzaicinājums vairs nav spēkā';
+$labels['sentresponseto'] = 'Atbilde uz uzaicinājumu veiksmīgi nosūtīta $mailto';
+$labels['localchangeswarning'] = 'Jūsu veiktās izmaiņas attēlosies tikai jūsu kalendārā un netiks nosūtītas pasākuma organizatoram.';
+$labels['importsuccess'] = 'Veiksmīgi importēti $nr notikumi';
+$labels['importnone'] = 'Nav atrasti notikumi ko importēt';
+$labels['importerror'] = 'Kļūda importa laikā';
+$labels['aclnorights'] = 'Jums nav šī kalendāra administratora tiesību';
+$labels['changeeventconfirm'] = 'Mainīt notikumu';
+$labels['removeeventconfirm'] = 'Dzēst notikumu';
+$labels['changerecurringeventwarning'] = 'Šis ir periodisks notikums. Vai vēlaties labot tikai šo notikumu, šo un visus šos nākotnes notikumus, visus šos notikumus, vai arī saglabāt šo kā jaunu notikumu?';
+$labels['removerecurringeventwarning'] = 'Šis ir periodisks notikums. Vai vēlaties dzēst tikai šo notikumu, šo un visus šos nākotnes notikumus vai arī visus šos notikumus?';
+$labels['removerecurringallonly'] = 'Šis ir periodisks notikums. Kā dalībnieks jūs varat tikai dzēst šo notikumu pilnībā.';
+$labels['currentevent'] = 'Pašreizējais';
+$labels['futurevents'] = 'Nākotne';
+$labels['allevents'] = 'Visi';
+$labels['saveasnew'] = 'Saglabāt kā jaunu';
+$labels['birthdays'] = 'Dzimšanas dienas';
+$labels['birthdayscalendar'] = 'Dzimšanas dienu kalendārs';
+$labels['displaybirthdayscalendar'] = 'Rādīt dzimšanas dienu kalendāru';
+$labels['birthdayscalendarsources'] = 'No  šīm adrešu grāmatām';
+$labels['birthdayeventtitle'] = '$name dzimšanas diena';
+$labels['birthdayage'] = 'Vecums $age';
+$labels['objectchangelog'] = 'Mainīt vēsturi';
+$labels['objectdiff'] = 'Izmaiņas no $rev1 uz $rev2';
+$labels['objectnotfound'] = 'Kļūda ielādējot notikuma datus';
+$labels['objectchangelognotavailable'] = 'Šī notikuma vēsturi mainīt nevar';
+$labels['objectdiffnotavailable'] = 'Izvēlētās versijas nav salīdzināmas';
+$labels['revisionrestoreconfirm'] = 'Vai tiešām vēlaties atjaunot šī notikuma $rev. versiju? Šī darbība aizstās pašreizējo notikumu ar veco versiju.';
+$labels['objectrestoresuccess'] = 'Versija $rev veiksmīgi atjaunota';
+$labels['objectrestoreerror'] = 'Kļūda atjaunojot veco versiju';
+$labels['arialabelminical'] = 'Kalendāra datuma izvēle';
+$labels['arialabelcalendarview'] = 'Kalendāra skats';
+$labels['arialabelsearchform'] = 'Notikumu meklēšanas forma';
+$labels['arialabelquicksearchbox'] = 'Notikumu meklēšanas ievadlauks';
+$labels['arialabelcalsearchform'] = 'Kalendāru meklēšanas forma';
+$labels['calendaractions'] = 'Darbības ar kalendāru';
+$labels['arialabeleventattendees'] = 'Dalībnieku saraksts';
+$labels['arialabeleventresources'] = 'Resursu saraksts';
+$labels['arialabelresourcesearchform'] = 'Resursu meklēšanas forma';
+$labels['arialabelresourceselection'] = 'Pieejamie resursi';
+?>
diff --git a/plugins/calendar/localization/nl_NL.inc b/plugins/calendar/localization/nl_NL.inc
index ec83bf54..25ed0467 100644
--- a/plugins/calendar/localization/nl_NL.inc
+++ b/plugins/calendar/localization/nl_NL.inc
@@ -6,30 +6,34 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
  */
-$labels['default_view'] = 'Standaard agenda';
-$labels['time_format'] = 'Tijdsformaat';
-$labels['timeslots'] = 'Tijdsdelen per uur';
+$labels['default_view'] = 'Standaardweergave';
+$labels['time_format'] = 'Tijdnotatie';
+$labels['timeslots'] = 'Tijdvakken per uur';
 $labels['first_day'] = 'Eerste weekdag';
 $labels['first_hour'] = 'Eerste uur om weer te geven';
 $labels['workinghours'] = 'Werkuren';
 $labels['add_category'] = 'Categorie toevoegen';
 $labels['remove_category'] = 'Categorie verwijderen';
-$labels['defaultcalendar'] = 'Maak nieuwe afspraken in';
-$labels['eventcoloring'] = 'Kleuren van afspraken';
-$labels['coloringmode0'] = 'Volgens kalender';
+$labels['defaultcalendar'] = 'Nieuwe activiteiten maken in';
+$labels['eventcoloring'] = 'Kleuren voor activiteiten';
+$labels['coloringmode0'] = 'Volgens agenda';
 $labels['coloringmode1'] = 'Volgens categorie';
-$labels['coloringmode2'] = 'Kalender voor omtrek, categorie voor inhoud';
-$labels['coloringmode3'] = 'Categorie voor omtrek, kalender voor inhoud';
-$labels['aftertrash'] = 'Verplaats naar prullenbak';
-$labels['afterdelete'] = 'Verwijder bericht';
-$labels['afterflagdeleted'] = 'Markeer als verwijderd';
-$labels['aftermoveto'] = 'Verplaats naar...';
-$labels['calendar'] = 'Kalender';
-$labels['calendars'] = 'Kalenders';
+$labels['coloringmode2'] = 'Agenda voor overzicht, categorie voor inhoud';
+$labels['coloringmode3'] = 'Categorie voor overzicht, agenda voor inhoud';
+$labels['afternothing'] = 'Niets doen';
+$labels['aftertrash'] = 'Verplaatsen naar Prullenbak';
+$labels['afterdelete'] = 'Bericht verwijderen';
+$labels['afterflagdeleted'] = 'Markeren als verwijderd';
+$labels['aftermoveto'] = 'Verplaatsen naar...';
+$labels['itipoptions'] = 'Uitnodigingen voor activiteiten';
+$labels['afteraction'] = 'Nadat een uitnodiging of updatebericht is verwerkt';
+$labels['weeknonone'] = 'nooit';
+$labels['calendar'] = 'Agenda';
+$labels['calendars'] = 'Agenda\'s';
 $labels['category'] = 'Categorie';
 $labels['categories'] = 'Categorieën';
-$labels['createcalendar'] = 'Maak een nieuwe kalender';
-$labels['editcalendar'] = 'Wijzig kalender eigenschappen';
+$labels['createcalendar'] = 'Nieuwe agenda maken';
+$labels['editcalendar'] = 'Agenda-eigenschappen bewerken';
 $labels['name'] = 'Naam';
 $labels['color'] = 'Kleur';
 $labels['day'] = 'Dag';
@@ -37,188 +41,228 @@ $labels['week'] = 'Week';
 $labels['month'] = 'Maand';
 $labels['agenda'] = 'Agenda';
 $labels['new'] = 'Nieuw';
-$labels['new_event'] = 'Nieuwe afspraak';
-$labels['edit_event'] = 'Wijzig afspraak';
-$labels['edit'] = 'Wijzig';
-$labels['save'] = 'Bewaar';
-$labels['cancel'] = 'Terug';
-$labels['select'] = 'Selecteer';
+$labels['new_event'] = 'Nieuwe activiteit';
+$labels['edit_event'] = 'Activiteit bewerken';
+$labels['edit'] = 'Bewerken';
+$labels['save'] = 'Opslaan';
+$labels['removelist'] = 'Verwijderen uit lijst';
+$labels['cancel'] = 'Annuleren';
+$labels['select'] = 'Selecteren';
 $labels['print'] = 'Afdrukken';
-$labels['printtitle'] = 'Kalenders afdrukken';
+$labels['printtitle'] = 'Agenda\'s afdrukken';
 $labels['title'] = 'Samenvatting';
-$labels['description'] = 'Omschrijving';
+$labels['description'] = 'Beschrijving';
 $labels['all-day'] = 'hele dag';
-$labels['export'] = 'Exporteer naar ICS';
-$labels['exporttitle'] = 'Als iCalender exporteren';
-$labels['exportrange'] = 'Afspraken uit';
-$labels['exportattachments'] = 'Exporteer bijlages';
-$labels['customdate'] = 'Aangepaste datumweergave';
+$labels['export'] = 'Exporteren';
+$labels['exporttitle'] = 'Exporteren naar iCalendar';
+$labels['exportrange'] = 'Activiteiten uit';
+$labels['exportattachments'] = 'Met bijlagen';
+$labels['customdate'] = 'Aangepaste datum';
 $labels['location'] = 'Locatie';
 $labels['url'] = 'URL';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Begin';
-$labels['starttime'] = 'Start time';
-$labels['end'] = 'Eind';
+$labels['starttime'] = 'Begintijd';
+$labels['end'] = 'Einde';
 $labels['endtime'] = 'Eindtijd';
-$labels['repeat'] = 'Herhaal';
-$labels['selectdate'] = 'Kies datum';
+$labels['repeat'] = 'Herhalen';
+$labels['selectdate'] = 'Datum kiezen';
 $labels['freebusy'] = 'Toon mij als';
-$labels['free'] = 'Vrij';
+$labels['free'] = 'Beschikbaar';
 $labels['busy'] = 'Bezet';
-$labels['outofoffice'] = 'Niet Aanwezig';
+$labels['outofoffice'] = 'Niet aanwezig';
 $labels['tentative'] = 'Misschien';
+$labels['mystatus'] = 'Mijn status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bevestigd';
-$labels['status-cancelled'] = 'Afgelast';
+$labels['status-cancelled'] = 'Geannuleerd';
+$labels['status-tentative'] = 'Misschien';
 $labels['priority'] = 'Prioriteit';
-$labels['sensitivity'] = 'Zichtbaarheid';
-$labels['public'] = 'publiek';
-$labels['private'] = 'prive';
+$labels['sensitivity'] = 'Privacy';
+$labels['public'] = 'openbaar';
+$labels['private'] = 'privé';
 $labels['confidential'] = 'vertrouwelijk';
+$labels['links'] = 'Referentie';
 $labels['alarms'] = 'Herinnering';
 $labels['comment'] = 'Opmerking';
+$labels['created'] = 'Gemaakt op';
+$labels['changed'] = 'Laatst gewijzigd op';
 $labels['unknown'] = 'Onbekend';
 $labels['eventoptions'] = 'Opties';
 $labels['generated'] = 'gegenereerd op';
 $labels['eventhistory'] = 'Geschiedenis';
-$labels['printdescriptions'] = 'Print beschrijvingen';
-$labels['parentcalendar'] = 'Voeg toe in';
-$labels['searchearlierdates'] = '« Zoek voor eerdere afspraken';
-$labels['searchlaterdates'] = 'Zoek voor latere afspraken »';
-$labels['andnmore'] = '$nr meer...';
+$labels['removelink'] = 'E-mailreferentie verwijderen';
+$labels['printdescriptions'] = 'Beschrijvingen afdrukken';
+$labels['parentcalendar'] = 'Invoegen in';
+$labels['searchearlierdates'] = '« Zoek eerdere activiteiten';
+$labels['searchlaterdates'] = 'Zoek latere activiteiten »';
+$labels['laterevents'] = 'Later';
+$labels['andnmore'] = 'Nog $nr...';
 $labels['togglerole'] = 'Klik om van rol te wisselen';
-$labels['createfrommail'] = 'Bewaar als afspraak';
-$labels['importevents'] = 'Afspraken importeren';
-$labels['importrange'] = 'Afspraken vanaf';
-$labels['onemonthback'] = '1 maand terug';
-$labels['nmonthsback'] = '$nr maanden terug';
-$labels['showurl'] = 'Toon kalender URL';
-$labels['showurldescription'] = 'Gebruik het volgende adres om uw kalendar te gebruiken (alleen lezen) in andere programma\'s. U kunt dit knippen en plakken in elk kalender programma dat het iCal formaat ondersteunt.';
-$labels['caldavurldescription'] = 'Kopieer dit adres in een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> programma (bijv. Evolution of Mozilla Thunderbird) om deze specifieke kalender volledig te synchronizeren met je computer of mobiel apparaat.';
-$labels['findcalendars'] = 'Vind agenda\'s...';
-$labels['searchterms'] = 'Search terms';
+$labels['createfrommail'] = 'Opslaan als activiteit';
+$labels['importevents'] = 'Activiteiten importeren';
+$labels['importrange'] = 'Activiteiten van';
+$labels['onemonthback'] = 'afgelopen maand';
+$labels['nmonthsback'] = 'afgelopen $nr maanden';
+$labels['showurl'] = 'URL van agenda tonen';
+$labels['showurldescription'] = 'Gebruik het volgende adres om uw agenda in andere programma\'s te gebruiken (alleen-lezen). U kunt dit knippen en plakken in elk agendaprogramma dat de iCal-indeling ondersteunt.';
+$labels['caldavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-client (bijv. Evolution of Mozilla Thunderbird) om deze specifieke agenda volledig te synchroniseren met uw computer of mobiele apparaat.';
+$labels['findcalendars'] = 'Agenda\'s zoeken...';
+$labels['searchterms'] = 'Zoektermen';
 $labels['calsearchresults'] = 'Beschikbare agenda\'s';
-$labels['calendarsubscribe'] = 'Permanent weergeven';
-$labels['invitationsdeclined'] = 'Afgewezen uitnodigingen';
-$labels['listrange'] = 'Bereik om te tonen:';
-$labels['listsections'] = 'Verdeel in:';
+$labels['calendarsubscribe'] = 'Definitief weergeven';
+$labels['nocalendarsfound'] = 'Geen agenda\'s gevonden';
+$labels['nrcalendarsfound'] = '$nr agenda\'s gevonden';
+$labels['quickview'] = 'Alleen deze agenda bekijken';
+$labels['invitationspending'] = 'Uitnodigingen in behandeling';
+$labels['invitationsdeclined'] = 'Afgeslagen uitnodigingen';
+$labels['changepartstat'] = 'Status van deelnemer wijzigen';
+$labels['rsvpcomment'] = 'Tekst van uitnodiging';
+$labels['listrange'] = 'Weer te geven bereik:';
+$labels['listsections'] = 'Verdelen in:';
 $labels['smartsections'] = 'Slimme secties';
 $labels['until'] = 'tot';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
 $labels['thisweek'] = 'Deze week';
 $labels['nextweek'] = 'Volgende week';
+$labels['prevweek'] = 'Vorige week';
 $labels['thismonth'] = 'Deze maand';
 $labels['nextmonth'] = 'Volgende maand';
 $labels['weekofyear'] = 'Week';
 $labels['pastevents'] = 'Verleden';
 $labels['futureevents'] = 'Toekomst';
-$labels['showalarms'] = 'Toon herinneringen';
-$labels['defaultalarmtype'] = 'Instelling standaard herinnering';
-$labels['defaultalarmoffset'] = 'Standaard herinneringstijd';
+$labels['showalarms'] = 'Herinneringen tonen';
+$labels['defaultalarmtype'] = 'Standaardinstelling herinnering';
+$labels['defaultalarmoffset'] = 'Standaardtijd herinnering';
 $labels['attendee'] = 'Deelnemer';
 $labels['role'] = 'Rol';
-$labels['availability'] = 'Beschikb.';
+$labels['availability'] = 'Beschikbaar';
 $labels['confirmstate'] = 'Status';
 $labels['addattendee'] = 'Deelnemer toevoegen';
-$labels['roleorganizer'] = 'Organisatie';
+$labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Verplicht';
 $labels['roleoptional'] = 'Optioneel';
 $labels['rolechair'] = 'Voorzitter';
 $labels['rolenonparticipant'] = 'Afwezig';
-$labels['cutypeindividual'] = 'Individueel';
+$labels['cutypeindividual'] = 'Persoon';
 $labels['cutypegroup'] = 'Groep';
-$labels['cutyperesource'] = 'Middel';
-$labels['cutyperoom'] = 'Kamer';
-$labels['availfree'] = 'Vrij';
+$labels['cutyperesource'] = 'Resource';
+$labels['cutyperoom'] = 'Ruimte';
+$labels['availfree'] = 'Beschikbaar';
 $labels['availbusy'] = 'Bezet';
 $labels['availunknown'] = 'Onbekend';
 $labels['availtentative'] = 'Misschien';
-$labels['availoutofoffice'] = 'Niet Aanwezig';
-$labels['delegatedto'] = 'Gedelegeerd aan';
-$labels['delegatedfrom'] = 'Gedelegeerd door';
-$labels['scheduletime'] = 'Vind beschikbaarheid';
-$labels['sendinvitations'] = 'Verzend uitnodigingen';
-$labels['sendnotifications'] = 'Verzend notificaties';
-$labels['sendcancellation'] = 'Verzend annulering';
-$labels['onlyworkinghours'] = 'Vind beschikbaarheid binnen mijn werkuren';
-$labels['reqallattendees'] = 'Verplicht/alle deelnemers';
-$labels['prevslot'] = 'vorig voorstel';
-$labels['nextslot'] = 'volgend voorstel';
-$labels['noslotfound'] = 'Geen voorstel gevonden';
+$labels['availoutofoffice'] = 'Niet aanwezig';
+$labels['scheduletime'] = 'Beschikbaarheid zoeken';
+$labels['sendinvitations'] = 'Uitnodigingen versturen';
+$labels['sendnotifications'] = 'Wijzigingen melden aan deelnemers';
+$labels['sendcancellation'] = 'Annulering van activiteiten melden aan deelnemers';
+$labels['onlyworkinghours'] = 'Beschikbaarheid binnen mijn werkuren zoeken';
+$labels['reqallattendees'] = 'Verplichte/alle deelnemers';
+$labels['prevslot'] = 'Vorig tijdstip';
+$labels['nextslot'] = 'Volgend tijdstip';
+$labels['suggestedslot'] = 'Voorgesteld tijdstip';
+$labels['noslotfound'] = 'Geen beschikbaar tijdstip gevonden';
 $labels['invitationsubject'] = 'U bent uitgenodigd voor "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nBijgevoegd vindt u een iCalendar bestand met alle details omtrent de afspraak die u kunt importeren in uw kalender programma.";
-$labels['invitationattendlinks'] = "In het geval dat uw email programma geen iTip verzoeken aankan, kunt u de volgende link gebruiken om deze uitnodiging te accepteren or af te wijzen :\n\$url";
-$labels['eventupdatesubject'] = '"$title" is gewijzigd';
-$labels['eventupdatesubjectempty'] = 'Een afspraak is gewijzigd';
-$labels['eventupdatemailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nBijgevoegd vindt u een iCalendar bestand met de gewijzigde details omtrent de afspraak die u kunt importeren in uw kalender programma.";
+$labels['invitationattendlinks'] = "In het geval dat uw e-mailprogramma geen iTip-verzoeken ondersteunt, kunt u de volgende koppeling gebruiken om deze uitnodiging te accepteren or af te slaan:\n\$url";
+$labels['eventupdatesubject'] = '"$title" is bijgewerkt';
+$labels['eventupdatesubjectempty'] = 'Een activiteit die u aangaat is bijgewerkt';
+$labels['eventupdatemailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de activiteit die u in uw agendaprogramma kunt importeren.";
 $labels['eventcancelsubject'] = '"$title" is geannuleerd';
-$labels['eventcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nDeze afspraak is geannuleerd door \$organizer.\n\nBijgevoegd vindt u een iCalendar bestand met de gewijzigde details omtrent de afspraak";
-$labels['itipobjectnotfound'] = 'De afspraak waaraan door dit bericht wordt gereferreerd is niet gevonden in uw kalender.';
-$labels['itipmailbodyaccepted'] = "\$sender heeft de uitnodiging geaccepteerd voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender heeft onder voorbehoud de uitnodiging geaccepteerd voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender heeft de uitnodiging afgewezen voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender heeft je deelname afgewezen voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date";
-$labels['itipdeclineevent'] = 'Wil u de uitnodiging voor deze afspraak afwijzen?';
-$labels['declinedeleteconfirm'] = 'Wilt u tevens deze afgewezen uitnodiging verwijderen uit je kalender?';
-$labels['itipcomment'] = 'Invitation/notification comment';
-$labels['notanattendee'] = 'U staat niet op de lijst van genodigden voor deze afspraak';
-$labels['eventcancelled'] = 'Dit evenement is afgelast';
-$labels['saveincalendar'] = 'bewaar in';
-$labels['updatemycopy'] = 'Wijzig in mijn kalender';
-$labels['savetocalendar'] = 'Opslaan in kalender';
-$labels['resource'] = 'Hulpmiddel';
-$labels['addresource'] = 'Voeg hulpmiddel toe';
-$labels['findresources'] = 'Vind hulpmiddelen';
+$labels['eventcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nDe activiteit is geannuleerd door \$organizer.\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de activiteit.";
+$labels['itipobjectnotfound'] = 'De activiteit die in dit bericht wordt vermeld staat niet in uw agenda.';
+$labels['itipmailbodyaccepted'] = "\$sender heeft de uitnodiging voor de volgende activiteit geaccepteerd:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender heeft de uitnodiging voor de volgende activiteit onder voorbehoud geaccepteerd:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender heeft de uitnodiging voor de volgende activiteit afgeslagen:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender heeft uw deelname aan de volgende activiteit afgewezen:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipmailbodydelegated'] = "\$sender heeft de deelname aan de volgende activiteit gedelegeerd:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender heeft de deelname aan de volgende activiteit gedelegeerd aan u:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipdeclineevent'] = 'Wil u de uitnodiging voor deze activiteit afslaan?';
+$labels['declinedeleteconfirm'] = 'Wilt u deze afgewezen activiteit ook verwijderen uit uw agenda?';
+$labels['itipcomment'] = 'Opmerking bij uitnodiging/melding';
+$labels['itipcommenttitle'] = 'Deze opmerking wordt toegevoegd aan de uitnodiging/melding die naar de deelnemers wordt verstuurd';
+$labels['notanattendee'] = 'U staat niet op de lijst met deelnemers aan deze activiteit';
+$labels['eventcancelled'] = 'De activiteit is geannuleerd';
+$labels['saveincalendar'] = 'opslaan in';
+$labels['updatemycopy'] = 'Bijwerken in mijn agenda';
+$labels['savetocalendar'] = 'Opslaan in agenda';
+$labels['openpreview'] = 'Agenda controleren';
+$labels['noearlierevents'] = 'Geen eerdere activiteiten';
+$labels['nolaterevents'] = 'Geen latere activiteiten';
+$labels['resource'] = 'Resource';
+$labels['addresource'] = 'Resource boeken';
+$labels['findresources'] = 'Resources zoeken';
 $labels['resourcedetails'] = 'Details';
 $labels['resourceavailability'] = 'Beschikbaarheid';
 $labels['resourceowner'] = 'Eigenaar';
-$labels['resourceadded'] = 'Hulpmiddel is toegevoegd aan uw afspraak';
+$labels['resourceadded'] = 'De resource is toegevoegd aan uw activiteit';
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
 $labels['tabattendees'] = 'Deelnemers';
-$labels['tabresources'] = 'Middelen';
-$labels['tabattachments'] = 'Toebehoren';
+$labels['tabresources'] = 'Resources';
+$labels['tabattachments'] = 'Bijlagen';
 $labels['tabsharing'] = 'Delen';
-$labels['deleteobjectconfirm'] = 'Weet je zeker dat je deze afspraak wilt verwijderen?';
-$labels['deleteventconfirm'] = 'Weet u zeker dat u deze afspraak wilt verwijderen?';
-$labels['deletecalendarconfirm'] = 'Weet u zeker dat u deze kalender samen met alle afspraken wilt verwijderen?';
-$labels['deletecalendarconfirmrecursive'] = 'Weet u zeker dat je deze kalender samen met alle afspraken en er onder hangende kalenders wilt verwijderen?';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['errorsaving'] = 'Opslaan mislukt.';
-$labels['operationfailed'] = 'De gevraagde opdracht is mislukt.';
-$labels['invalideventdates'] = 'Ongeldige datums ingevoerd! Controleer aub uw invoer.';
-$labels['invalidcalendarproperties'] = 'Ongeldige kalender eigenschappen! Gebruik aub een geldige naam.';
-$labels['searchnoresults'] = 'Geen afspraken gevonden in de geselecteerde kalenders.';
-$labels['successremoval'] = 'De afspraak is succesvol verwijdert.';
-$labels['successrestore'] = 'De afspraak is succesvol herstelt';
-$labels['errornotifying'] = 'Uitnodigingen versturen naar de genodigden van de afspraak is mislukt';
-$labels['errorimportingevent'] = 'Afspraak importeren is mislukt';
-$labels['importwarningexists'] = 'Een kopie van deze afspraak bevindt zich al in uw kalender.';
-$labels['newerversionexists'] = 'Een nieuwere versie van deze afspraak bestaat! Bewerking afgebroken.';
-$labels['nowritecalendarfound'] = 'Geen kalender gevonden om de afspraak in op te slaan';
-$labels['importedsuccessfully'] = 'De afspraak is succesvol toegevoegd aan \'$calendar\'';
-$labels['updatedsuccessfully'] = 'Het bijwerken van de gebeurtenis in \'$calendar\' is geslaagd';
-$labels['attendeupdateesuccess'] = 'Status van genodigde succesvol gewijzigd';
-$labels['itipsendsuccess'] = 'Uitnodiging verstuurd aan de genodigden.';
-$labels['itipresponseerror'] = 'Antwoord op deze uitnodiging versturen is mislukt';
-$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet langer geldig';
-$labels['sentresponseto'] = 'Antwoord op deze uitnodiging was succesvol verstuurd aan $mailto';
-$labels['localchangeswarning'] = 'U bent bezig wijzigingen te maken die alleen zichtbaar zijn in u eigen kalender en die niet doorgestuurd zullen worden aan de organisator van de afspraak.';
-$labels['importsuccess'] = 'Succesvol $nr afspraken geïmporteerd';
-$labels['importnone'] = 'Geen afspraken gevonden om te importeren';
+$labels['deleteobjectconfirm'] = 'Weet u zeker dat u deze activiteit wilt verwijderen?';
+$labels['deleteventconfirm'] = 'Weet u zeker dat u deze activiteit wilt verwijderen?';
+$labels['deletecalendarconfirm'] = 'Weet u zeker dat u deze agenda en alle activiteiten erin wilt verwijderen?';
+$labels['deletecalendarconfirmrecursive'] = 'Weet u zeker dat u deze agenda en alle activiteiten erin alsook de subagenda\'s wilt verwijderen?';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['errorsaving'] = 'Opslaan van wijzigingen is mislukt.';
+$labels['operationfailed'] = 'De gevraagde bewerking is mislukt.';
+$labels['invalideventdates'] = 'Ongeldige datums ingevoerd! Controleer de invoer.';
+$labels['invalidcalendarproperties'] = 'Ongeldige agenda-eigenschappen! Stel een geldige naam in.';
+$labels['searchnoresults'] = 'Geen activiteiten gevonden in de geselecteerde agenda\'s.';
+$labels['successremoval'] = 'De activiteit is met succes verwijderd.';
+$labels['successrestore'] = 'De activiteit is met succes hersteld.';
+$labels['errornotifying'] = 'Versturen van meldingen naar deelnemers van activiteit is mislukt';
+$labels['errorimportingevent'] = 'Importeren van activiteit is mislukt';
+$labels['importwarningexists'] = 'Een exemplaar van deze activiteit staat al in uw agenda.';
+$labels['newerversionexists'] = 'Er bestaat al een nieuwere versie van deze activiteit! Bewerking afgebroken.';
+$labels['nowritecalendarfound'] = 'Geen agenda gevonden om de activiteit op te slaan';
+$labels['importedsuccessfully'] = 'De activiteit is met succes toegevoegd aan \'$calendar\'';
+$labels['updatedsuccessfully'] = 'De activiteit is met succes bijgewerkt in \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Status van deelnemer is met succes bijgewerkt';
+$labels['itipsendsuccess'] = 'Uitnodiging is naar deelnemers verstuurd.';
+$labels['itipresponseerror'] = 'Versturen van antwoord op uitnodiging voor activiteit is mislukt';
+$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet meer geldig';
+$labels['sentresponseto'] = 'Antwoord op uitnodiging is met succes verstuurd naar $mailto';
+$labels['localchangeswarning'] = 'U gaat wijzigingen maken die alleen zichtbaar zullen zijn in uw eigen agenda en die niet naar de organisator van de activiteit zullen worden verstuurd.';
+$labels['importsuccess'] = '$nr activiteiten met succes geïmporteerd';
+$labels['importnone'] = 'Geen activiteiten gevonden om te importeren';
 $labels['importerror'] = 'Er is een fout tijdens het importeren opgetreden';
-$labels['aclnorights'] = 'U heeft geen administratieve rechten op deze kalender.';
-$labels['changeeventconfirm'] = 'Wijzig afspraak';
-$labels['changerecurringeventwarning'] = 'Dit is een terugkerende afspraak. Wilt u alleen de huidige afspraak wijzigen, deze en alle toekomstige afspraken, alle afspraken of opslaan als een nieuwe afspraak?';
+$labels['aclnorights'] = 'U hebt geen administratorrechten voor deze agenda.';
+$labels['changeeventconfirm'] = 'Activiteit wijzigen';
+$labels['removeeventconfirm'] = 'Activiteit verwijderen';
+$labels['changerecurringeventwarning'] = 'Dit is een herhaalde activiteit. Wilt u alleen de huidige activiteit, deze en alle toekomstige herhalingen of alle herhalingen bewerken of wilt u deze opslaan als een nieuwe activiteit?';
+$labels['removerecurringeventwarning'] = 'Dit is een herhaalde activiteit. Wilt u alleen de huidige activiteit, deze en alle toekomstige herhalingen of alle herhalingen van deze activiteit verwijderen?';
+$labels['removerecurringallonly'] = 'Dit is een herhaalde activiteit. Als deelnemer kunt u alleen de volledige activiteit met alle herhalingen verwijderen.';
 $labels['currentevent'] = 'Huidige';
 $labels['futurevents'] = 'Toekomstige';
 $labels['allevents'] = 'Alle';
-$labels['saveasnew'] = 'Bewaar als nieuw';
+$labels['saveasnew'] = 'Opslaan als nieuw';
 $labels['birthdays'] = 'Verjaardagen';
 $labels['birthdayscalendar'] = 'Verjaardagskalender';
-$labels['displaybirthdayscalendar'] = 'Toon verjaardagskalender';
+$labels['displaybirthdayscalendar'] = 'Verjaardagskalender weergeven';
 $labels['birthdayscalendarsources'] = 'Uit deze adresboeken';
 $labels['birthdayeventtitle'] = 'verjaardag van $name';
-$labels['birthdayage'] = 'Leeftijd $age';
+$labels['birthdayage'] = '$age jaar';
+$labels['objectchangelog'] = 'Geschiedenis wijzigen';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
+$labels['objectnotfound'] = 'Laden van activiteitsgegevens is mislukt';
+$labels['objectchangelognotavailable'] = 'Voor deze activiteit kunt u de geschiedenis niet wijzigen';
+$labels['objectdiffnotavailable'] = 'Geen vergelijking mogelijk voor de geselecteerde revisies';
+$labels['revisionrestoreconfirm'] = 'Weet u zeker dat u revisie $rev van deze activiteit wilt herstellen? Met deze actie vervangt u de huidige activiteit door de oude versie.';
+$labels['objectrestoresuccess'] = 'Revisie $rev met succes hersteld';
+$labels['objectrestoreerror'] = 'Herstellen van oude revisie is mislukt';
+$labels['arialabelminical'] = 'Datum in agenda selecteren';
+$labels['arialabelcalendarview'] = 'Agendaweergave';
+$labels['arialabelsearchform'] = 'Zoekformulier voor activiteiten';
+$labels['arialabelquicksearchbox'] = 'Zoekopdracht voor activiteiten';
+$labels['arialabelcalsearchform'] = 'Zoekformulier voor agenda\'s';
+$labels['calendaractions'] = 'Acties voor agenda';
+$labels['arialabeleventattendees'] = 'Lijst met deelnemers van activiteit';
+$labels['arialabeleventresources'] = 'Lijst met resources voor activiteit';
+$labels['arialabelresourcesearchform'] = 'Zoekformulier voor resources';
+$labels['arialabelresourceselection'] = 'Beschikbare resources';
 ?>
diff --git a/plugins/calendar/localization/pl_PL.inc b/plugins/calendar/localization/pl_PL.inc
index c3f476b1..7c80ab31 100644
--- a/plugins/calendar/localization/pl_PL.inc
+++ b/plugins/calendar/localization/pl_PL.inc
@@ -75,6 +75,7 @@ $labels['mystatus'] = 'Mój status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Potwierdzony';
 $labels['status-cancelled'] = 'Anulowany';
+$labels['status-tentative'] = 'Niepewny';
 $labels['priority'] = 'Priorytet';
 $labels['sensitivity'] = 'Poufność';
 $labels['public'] = 'publiczny';
@@ -94,6 +95,7 @@ $labels['printdescriptions'] = 'Drukuj opisy';
 $labels['parentcalendar'] = 'Wstaw wewnątrz';
 $labels['searchearlierdates'] = '« Szukaj wcześniejszych zdarzeń';
 $labels['searchlaterdates'] = 'Szukaj późniejszych zdarzeń »';
+$labels['laterevents'] = 'Później';
 $labels['andnmore'] = '$nr więcej...';
 $labels['togglerole'] = 'Kliknuj aby przestawić rolę';
 $labels['createfrommail'] = 'Zapisz jako zdarzenie';
@@ -151,8 +153,6 @@ $labels['availbusy'] = 'Zajęty';
 $labels['availunknown'] = 'Nieznany';
 $labels['availtentative'] = 'Niepewny';
 $labels['availoutofoffice'] = 'Poza biurem';
-$labels['delegatedto'] = 'Oddelegowany do:';
-$labels['delegatedfrom'] = 'Oddelegowany z:';
 $labels['scheduletime'] = 'Sprawdź dostępność';
 $labels['sendinvitations'] = 'Wyślij zaproszenia';
 $labels['sendnotifications'] = 'Powiadom uczestników o zmianach';
@@ -164,7 +164,7 @@ $labels['nextslot'] = 'Następny przedział';
 $labels['suggestedslot'] = 'Sugerowany przedział';
 $labels['noslotfound'] = 'Nie znaleziono wolnego przedziału czasu';
 $labels['invitationsubject'] = 'Zostałeś zaproszony do "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nW załączeniu plik w formacie iCalendar ze szczegółami zdarzenia, który możesz zaimportować do twojej aplikacji kalendarza.";
+$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\n\$description\n\nW załączeniu plik w formacie iCalendar ze szczegółami zdarzenia, który możesz zaimportować do twojej aplikacji kalendarza.";
 $labels['invitationattendlinks'] = "W przypadku gdy klient poczty elektronicznej nie obsługuje rządań w formacie iTip, aby zaakceptować lub odrzucić to zaproszenie, można skorzystać z następującego linku:\n\$url ";
 $labels['eventupdatesubject'] = '"$title" zostało zaktualizowane';
 $labels['eventupdatesubjectempty'] = 'Zdarzenie które cię dotyczy zostało zaktualizowane';
@@ -176,6 +176,8 @@ $labels['itipmailbodyaccepted'] = "\$sender zaakceptował zaproszenie do następ
 $labels['itipmailbodytentative'] = "\$sender warunkowo zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender odrzucił zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender odrzucił twój udział w zastępującym zdarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegated'] = "\$sender oddelegował udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender oddelegował do ciebie udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
 $labels['itipdeclineevent'] = 'Czy chcesz odrzucić zaproszenie na to zdarzenie?';
 $labels['declinedeleteconfirm'] = 'Czy chcesz także usunąć to odrzucone zdarzenie ze swojego kalendarza?';
 $labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
@@ -246,10 +248,13 @@ $labels['birthdayscalendarsources'] = 'Z tych książek adresowych';
 $labels['birthdayeventtitle'] = 'Urodziny $name\'s';
 $labels['birthdayage'] = 'Wiek $age';
 $labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
 $labels['objectnotfound'] = 'Nie udało się wczytać zdarzenia';
 $labels['objectchangelognotavailable'] = 'Historia zmian jest niedostępna dla tego zdarzenia';
 $labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
 $labels['revisionrestoreconfirm'] = 'Czy na pewno chcesz przywrócić wersję $rev tego zdarzenia? Bierzące zdarzenie zostanie zastąpione starszą wersją.';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
 $labels['arialabelminical'] = 'Wybór daty kalendarza';
 $labels['arialabelcalendarview'] = 'Podgląd kalendarza';
 $labels['arialabelsearchform'] = 'Formularz wyszukiwania zdarzeń';
diff --git a/plugins/calendar/localization/pt_BR.inc b/plugins/calendar/localization/pt_BR.inc
index 9ff9dbba..8ee1bc83 100644
--- a/plugins/calendar/localization/pt_BR.inc
+++ b/plugins/calendar/localization/pt_BR.inc
@@ -20,6 +20,12 @@ $labels['coloringmode0'] = 'De acordo com o calendário';
 $labels['coloringmode1'] = 'De acordo com a categoria';
 $labels['coloringmode2'] = 'Calendário para esboço, categoria para conteúdo';
 $labels['coloringmode3'] = 'Categoria para esboço, calendário para conteúdo';
+$labels['aftertrash'] = 'Mover para Lixeira';
+$labels['afterdelete'] = 'Apagar a mensagem';
+$labels['aftermoveto'] = 'Mover para...';
+$labels['itipoptions'] = 'Convites para Eventos';
+$labels['showweekno'] = 'Exibir número de semanas';
+$labels['weeknonone'] = 'nunca';
 $labels['calendar'] = 'Calendário';
 $labels['calendars'] = 'Calendários';
 $labels['category'] = 'Categoria';
@@ -37,6 +43,7 @@ $labels['new_event'] = 'Novo evento';
 $labels['edit_event'] = 'Editar evento';
 $labels['edit'] = 'Editar';
 $labels['save'] = 'Gravar';
+$labels['removelist'] = 'Remover da lista';
 $labels['cancel'] = 'Cancelar';
 $labels['select'] = 'Selecionar';
 $labels['print'] = 'Imprimir';
@@ -47,12 +54,13 @@ $labels['all-day'] = 'dia todo';
 $labels['export'] = 'Exportar';
 $labels['exporttitle'] = 'Exportar para iCalendar';
 $labels['exportrange'] = 'Eventos de';
-$labels['exportattachments'] = 'With attachments';
+$labels['exportattachments'] = 'Com anexos';
 $labels['customdate'] = 'Custom date';
 $labels['location'] = 'Local';
 $labels['url'] = 'URL';
 $labels['date'] = 'Data';
 $labels['start'] = 'Início';
+$labels['starttime'] = 'Hora de início';
 $labels['end'] = 'Término';
 $labels['repeat'] = 'Repetir';
 $labels['selectdate'] = 'Escolha a data';
@@ -64,6 +72,7 @@ $labels['tentative'] = 'Tentativa';
 $labels['status'] = 'Situação';
 $labels['status-confirmed'] = 'Confirmado';
 $labels['status-cancelled'] = 'Cancalado';
+$labels['status-tentative'] = 'Tentativa';
 $labels['priority'] = 'Prioridade';
 $labels['sensitivity'] = 'Privacidade';
 $labels['public'] = 'público';
@@ -73,13 +82,17 @@ $labels['links'] = 'Reference';
 $labels['alarms'] = 'Lembrete';
 $labels['comment'] = 'Comentário';
 $labels['created'] = 'Created';
+$labels['changed'] = 'Última modificação';
 $labels['unknown'] = 'Desconhecido';
 $labels['eventoptions'] = 'Opções';
 $labels['generated'] = 'gerado em';
+$labels['eventhistory'] = 'História';
+$labels['removelink'] = 'Remover referência do email';
 $labels['printdescriptions'] = 'Descrições de impressão';
 $labels['parentcalendar'] = 'Inserir dentro';
 $labels['searchearlierdates'] = '« Procurar por eventos anteriores';
 $labels['searchlaterdates'] = 'Procurar por eventos posteriores »';
+$labels['laterevents'] = 'Mais tarde';
 $labels['andnmore'] = '$nr mais...';
 $labels['togglerole'] = 'Clique para alternar o papel';
 $labels['createfrommail'] = 'Salvar como evento';
@@ -107,6 +120,7 @@ $labels['nextmonth'] = 'Próximo mês';
 $labels['weekofyear'] = 'Semana';
 $labels['pastevents'] = 'Passado';
 $labels['futureevents'] = 'Futuro';
+$labels['showalarms'] = 'Mostrar lembrentes';
 $labels['defaultalarmtype'] = 'Configuração de lembrete padrão';
 $labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
 $labels['attendee'] = 'Participante';
@@ -117,6 +131,7 @@ $labels['addattendee'] = 'Adicionar participante';
 $labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Obrigatório';
 $labels['roleoptional'] = 'Opcional';
+$labels['rolechair'] = 'Cadeira';
 $labels['cutypegroup'] = 'Grupo';
 $labels['cutyperesource'] = 'Recurso';
 $labels['availfree'] = 'Disponível';
@@ -124,8 +139,6 @@ $labels['availbusy'] = 'Ocupado';
 $labels['availunknown'] = 'Desconhecido';
 $labels['availtentative'] = 'Tentativa';
 $labels['availoutofoffice'] = 'Fora de escritório';
-$labels['delegatedto'] = 'Delegado para:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['scheduletime'] = 'Procurar disponibilidade';
 $labels['sendinvitations'] = 'Enviar convites';
 $labels['sendnotifications'] = 'Avisar os participantes sobre as modificações';
@@ -136,12 +149,10 @@ $labels['prevslot'] = 'Espaço anterior';
 $labels['nextslot'] = 'Próximo espaço';
 $labels['noslotfound'] = 'Incapaz de encontrar um horário disponível';
 $labels['invitationsubject'] = 'Você foi convidado para "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com todos os detalhes do evento na qual você pode importar para sua aplicação de calendário.";
 $labels['invitationattendlinks'] = "No caso do seu cliente de e-mail não suportar requisições iTIP você pode usar o link a seguir para aceitar ou recusar este convite:\n\$url";
 $labels['eventupdatesubject'] = '"$title" foi atualizado';
 $labels['eventupdatesubjectempty'] = 'Um evento do seu interesse foi atualizado';
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento na qual você pode importar para sua aplicação de calendário.";
-$labels['eventcancelsubject'] = '"$title" foi cancelado';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nO evento foi cancelado por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento.";
 $labels['itipobjectnotfound'] = 'O evento referenciado por esta mensagem não foi encontrado em seu calendário.';
 $labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
@@ -210,4 +221,5 @@ $labels['displaybirthdayscalendar'] = 'Display birthdays calendar';
 $labels['birthdayscalendarsources'] = 'From these address books';
 $labels['birthdayeventtitle'] = '$name\'s Birthday';
 $labels['birthdayage'] = 'Age $age';
+$labels['objectchangelog'] = 'Mudar Histórico';
 ?>
diff --git a/plugins/calendar/localization/pt_PT.inc b/plugins/calendar/localization/pt_PT.inc
index d6b38aba..a8c065a4 100644
--- a/plugins/calendar/localization/pt_PT.inc
+++ b/plugins/calendar/localization/pt_PT.inc
@@ -6,7 +6,7 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
  */
-$labels['default_view'] = 'Visualização padrão';
+$labels['default_view'] = 'Visualização predefinida';
 $labels['time_format'] = 'Formato da hora';
 $labels['timeslots'] = 'Entradas por hora';
 $labels['first_day'] = 'Primeiro dia da semana';
@@ -75,6 +75,7 @@ $labels['mystatus'] = 'O meu estado';
 $labels['status'] = 'Estado';
 $labels['status-confirmed'] = 'Confirmado';
 $labels['status-cancelled'] = 'Cancelado';
+$labels['status-tentative'] = 'Tentativa';
 $labels['priority'] = 'Prioridade';
 $labels['sensitivity'] = 'Privacidade';
 $labels['public'] = 'público';
@@ -130,8 +131,8 @@ $labels['weekofyear'] = 'Semana';
 $labels['pastevents'] = 'Passado';
 $labels['futureevents'] = 'Futuro';
 $labels['showalarms'] = 'Mostrar lembretes';
-$labels['defaultalarmtype'] = 'Configuração padrão de lembrete';
-$labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
+$labels['defaultalarmtype'] = 'Notificação predefinida dos lembretes';
+$labels['defaultalarmoffset'] = 'Agendamento predefinido das notificações';
 $labels['attendee'] = 'Participante';
 $labels['role'] = 'Papel';
 $labels['availability'] = 'Disp.';
@@ -151,8 +152,6 @@ $labels['availbusy'] = 'Ocupado';
 $labels['availunknown'] = 'Desconhecido';
 $labels['availtentative'] = 'Tentativa';
 $labels['availoutofoffice'] = 'Ausente';
-$labels['delegatedto'] = 'Delegado a:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['scheduletime'] = 'Procurar disponibilidade';
 $labels['sendinvitations'] = 'Enviar convites';
 $labels['sendnotifications'] = 'Avisar os participantes sobre as alterações';
@@ -164,12 +163,11 @@ $labels['nextslot'] = 'Próximo espaço';
 $labels['suggestedslot'] = 'Espaço sugerido';
 $labels['noslotfound'] = 'Incapaz de encontrar um horário disponível';
 $labels['invitationsubject'] = 'Foi convidado para "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com todos os detalhes de um evento, o qual pode importar para o seu calendário.";
 $labels['invitationattendlinks'] = "No caso do seu cliente de e-mail não suportar pedidos do tipo iTIP, pode usar o seguinte link para aceitar ou recusar este convite:\n\$url";
 $labels['eventupdatesubject'] = '"$title" foi atualizado.';
 $labels['eventupdatesubjectempty'] = 'Um evento do seu interesse foi atualizado';
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar atualizado com os detalhes de um evento, o qual pode importar para o seu calendário.";
-$labels['eventcancelsubject'] = '"$title" foi cancelado.';
+$labels['eventcancelsubject'] = '"$title" foi cancelado';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nO evento foi cancelado por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento.";
 $labels['itipobjectnotfound'] = 'O evento citado nesta mensagem não foi encontrado no seu calendário.';
 $labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
@@ -244,23 +242,17 @@ $labels['saveasnew'] = 'Guardar como';
 $labels['birthdays'] = 'Aniversários';
 $labels['birthdayscalendar'] = 'Calendário de aniversários';
 $labels['displaybirthdayscalendar'] = 'Mostrar calendário de aniversários';
-$labels['birthdayscalendarsources'] = 'From these address books';
+$labels['birthdayscalendarsources'] = 'Agendas a incluir:';
 $labels['birthdayeventtitle'] = 'Aniversário de $name';
 $labels['birthdayage'] = 'Idade $age';
 $labels['objectchangelog'] = 'Alterar histórico';
-$labels['revision'] = 'Revisão';
-$labels['user'] = 'Utilizador';
-$labels['operation'] = 'Ação';
-$labels['actionappend'] = 'Guardado';
-$labels['actionmove'] = 'Movido';
-$labels['actiondelete'] = 'Eliminado';
-$labels['compare'] = 'Comparar';
-$labels['showrevision'] = 'Mostrar esta versão';
-$labels['restore'] = 'Restaurar esta versão';
+$labels['objectdiff'] = 'Diferenças entre $rev1 e $rev2';
 $labels['objectnotfound'] = 'Falha ao ler os dados do evento';
 $labels['objectchangelognotavailable'] = 'Não é possível alterar o histórico deste evento';
-$labels['objectdiffnotavailable'] = 'Não é possível comparar as revisões selecionadas';
-$labels['revisionrestoreconfirm'] = 'Confirma o restauro da revisão $rev deste evento? Os dados atuais serão substituídos pelos da versão anterior.';
+$labels['objectdiffnotavailable'] = 'Não é possível comparar as versões selecionadas';
+$labels['revisionrestoreconfirm'] = 'Confirma a reposição das alterações $rev deste evento? Os dados atuais serão substituídos pela versão anterior.';
+$labels['objectrestoresuccess'] = 'A versão $rev foi reposta com sucesso.';
+$labels['objectrestoreerror'] = 'Não foi possível repor a versão anterior.';
 $labels['arialabelminical'] = 'Seleção da data do calendário';
 $labels['arialabelcalendarview'] = 'Vista do calendário';
 $labels['arialabelsearchform'] = 'Quadro de pesquisa de eventos';
diff --git a/plugins/calendar/localization/ru_RU.inc b/plugins/calendar/localization/ru_RU.inc
index 716af108..c8d4fe8d 100644
--- a/plugins/calendar/localization/ru_RU.inc
+++ b/plugins/calendar/localization/ru_RU.inc
@@ -27,6 +27,7 @@ $labels['afterflagdeleted'] = 'Пометить как удалённое';
 $labels['aftermoveto'] = 'Переместить в...';
 $labels['itipoptions'] = 'Приглашения на события';
 $labels['afteraction'] = 'После того, как приглашение или сообщение о его изменении обработано';
+$labels['weeknonone'] = 'никогда';
 $labels['calendar'] = 'Календарь';
 $labels['calendars'] = 'Календари';
 $labels['category'] = 'Категория';
@@ -75,6 +76,7 @@ $labels['mystatus'] = 'Мой статус';
 $labels['status'] = 'Статус';
 $labels['status-confirmed'] = 'Подтвеждённый';
 $labels['status-cancelled'] = 'Отмененные';
+$labels['status-tentative'] = 'Неопределённо';
 $labels['priority'] = 'Приоритет';
 $labels['sensitivity'] = 'Секретность';
 $labels['public'] = 'общедоступная';
@@ -94,6 +96,7 @@ $labels['printdescriptions'] = 'Печатать описания';
 $labels['parentcalendar'] = 'Вставить внутри';
 $labels['searchearlierdates'] = '« Искать события раньше';
 $labels['searchlaterdates'] = 'Искать события позже »';
+$labels['laterevents'] = 'Позднее';
 $labels['andnmore'] = '$nr больше...';
 $labels['togglerole'] = 'Кликните для переключения роли';
 $labels['createfrommail'] = 'Сохранить как событие';
@@ -151,8 +154,6 @@ $labels['availbusy'] = 'Занят';
 $labels['availunknown'] = 'Неизвестно';
 $labels['availtentative'] = 'Предварительно';
 $labels['availoutofoffice'] = 'Вне офиса';
-$labels['delegatedto'] = 'Поручено:';
-$labels['delegatedfrom'] = 'Поручено от:';
 $labels['scheduletime'] = 'Найти доступность';
 $labels['sendinvitations'] = 'Отправить приглашения';
 $labels['sendnotifications'] = 'Уведомить участников об изменениях';
@@ -164,7 +165,6 @@ $labels['nextslot'] = 'Следующее время';
 $labels['suggestedslot'] = 'Предлагаемое время';
 $labels['noslotfound'] = 'Невозможно найти свободное время';
 $labels['invitationsubject'] = 'Вы приглашены на "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nВо вложении вы найдёте файл iCalendar со всеми деталями события, который Вы можете импортировать в Вашу программу-ежедневник.";
 $labels['invitationattendlinks'] = "В случае, если Ваш почтовый клиент не поддерживает запросы iTip, Вы можете использовать ссылку данную ниже, чтобы принять или отклонить это приглашение:\n\$url";
 $labels['eventupdatesubject'] = '"$title" было обновлено';
 $labels['eventupdatesubjectempty'] = 'Событие, которое касается Вас, было обновлено';
diff --git a/plugins/calendar/localization/sk_SK.inc b/plugins/calendar/localization/sk_SK.inc
index 44e9f156..42ff27d6 100644
--- a/plugins/calendar/localization/sk_SK.inc
+++ b/plugins/calendar/localization/sk_SK.inc
@@ -70,6 +70,7 @@ $labels['mystatus'] = 'Môj stav';
 $labels['status'] = 'Stav';
 $labels['status-confirmed'] = 'Potvrdené';
 $labels['status-cancelled'] = 'Zrušené';
+$labels['status-tentative'] = 'Nezáväzne';
 $labels['priority'] = 'Priorita';
 $labels['importrange'] = 'Udalosti z';
 $labels['weekofyear'] = 'Týždeň';
diff --git a/plugins/calendar/localization/sl_SI.inc b/plugins/calendar/localization/sl_SI.inc
index d143c976..46cd47bc 100644
--- a/plugins/calendar/localization/sl_SI.inc
+++ b/plugins/calendar/localization/sl_SI.inc
@@ -75,6 +75,7 @@ $labels['mystatus'] = 'Moj status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Potrjeno';
 $labels['status-cancelled'] = 'Preklicano';
+$labels['status-tentative'] = 'Pogojno';
 $labels['priority'] = 'Prednost';
 $labels['sensitivity'] = 'Zasebnost';
 $labels['public'] = 'javno';
@@ -94,6 +95,7 @@ $labels['printdescriptions'] = 'Opis za tisk';
 $labels['parentcalendar'] = 'Vstavi';
 $labels['searchearlierdates'] = '« Išči po prejšnjih dogodkih';
 $labels['searchlaterdates'] = 'Išči po kasnejših dogodkih »';
+$labels['laterevents'] = 'Kasneje';
 $labels['andnmore'] = '$nr več...';
 $labels['togglerole'] = 'Klikni za prikaz vloge';
 $labels['createfrommail'] = 'Shrani kot dogodek';
@@ -151,8 +153,6 @@ $labels['availbusy'] = 'Zaseden';
 $labels['availunknown'] = 'Neznano';
 $labels['availtentative'] = 'Pogojno';
 $labels['availoutofoffice'] = 'Izven pisarne';
-$labels['delegatedto'] = 'Preneseno na:';
-$labels['delegatedfrom'] = 'Preneseno od:';
 $labels['scheduletime'] = 'Najdi razpoložljivost';
 $labels['sendinvitations'] = 'Pošlji vabila';
 $labels['sendnotifications'] = 'Sporoči udeležencem spremembe';
@@ -164,12 +164,10 @@ $labels['nextslot'] = 'Naslednje mesto';
 $labels['suggestedslot'] = 'Predlagano mesto';
 $labels['noslotfound'] = 'Ne najdem prostega mesta';
 $labels['invitationsubject'] = 'Vabljeni ste v "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nProsim preglejte pripeto iCalendar datoteko z vsemi informacijami o dogodku. Datoteko lahko uvozite v vašo koledar aplikacijo.";
 $labels['invitationattendlinks'] = "V kolikor vaš email klient ne podpira iTip zahtevkov lahko uporabite naslednjo povezavo za sprejem ali zavrnitev vabila:\n\$url";
 $labels['eventupdatesubject'] = '"$title" je bil posodobljen';
 $labels['eventupdatesubjectempty'] = 'Dogodek, ki vas zadeva je bil posodobljen';
 $labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nProsim preglejte pripeto iCalendar datoteko s posodobljenimi informacijami o dogodku. Datoteko lahko uvozite v vašo koledar aplikacijo.";
-$labels['eventcancelsubject'] = '"$title" je bil preklican';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nDogodek je bil preklican s strani \$organizer.\n\nProsim preglejte pripeto iCalendar datoteko s posodobljenimi informacijami o dogodku.";
 $labels['itipobjectnotfound'] = 'Dogodek, na katerega se nanaša to sporočilo, ni bil najden v vašem koledarju.';
 $labels['itipmailbodyaccepted'] = "\$sender je sprejel vabilo na dogodek:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
diff --git a/plugins/calendar/localization/sv_SE.inc b/plugins/calendar/localization/sv_SE.inc
index e98f27a4..72ba3225 100644
--- a/plugins/calendar/localization/sv_SE.inc
+++ b/plugins/calendar/localization/sv_SE.inc
@@ -75,6 +75,7 @@ $labels['mystatus'] = 'Min status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bekräftad';
 $labels['status-cancelled'] = 'Inställd';
+$labels['status-tentative'] = 'Preliminärt';
 $labels['priority'] = 'Prioritet';
 $labels['sensitivity'] = 'Integritet';
 $labels['public'] = 'publik';
@@ -151,8 +152,6 @@ $labels['availbusy'] = 'Upptagen';
 $labels['availunknown'] = 'Okänd';
 $labels['availtentative'] = 'Preliminärt';
 $labels['availoutofoffice'] = 'Frånvarande';
-$labels['delegatedto'] = 'Delegerad till:';
-$labels['delegatedfrom'] = 'Delegerad från:';
 $labels['scheduletime'] = 'Hitta tillgänglighet';
 $labels['sendinvitations'] = 'Skicka inbjudningar';
 $labels['sendnotifications'] = 'Meddela deltagare om ändringar';
@@ -164,12 +163,10 @@ $labels['nextslot'] = 'Nästa lucka';
 $labels['suggestedslot'] = 'Föreslagen lucka';
 $labels['noslotfound'] = 'Det gick inte att hitta en ledig tidslucka';
 $labels['invitationsubject'] = 'Du har blivit inbjuden till "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHärmed bifogas en iCalendar-fil med alla detaljer om händelsen som du kan importera till din kalenderapplikation.";
 $labels['invitationattendlinks'] = "Om din e-postklient inte stöder iTip-förfrågningar kan du använda följande länk för att antingen tacka ja eller eller nej till denna inbjudan:\n\$url";
 $labels['eventupdatesubject'] = '"$title" har uppdaterats';
 $labels['eventupdatesubjectempty'] = 'En händelse som berör dig har uppdaterats';
 $labels['eventupdatemailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHärmed bifogas en iCalendar-fil med uppdaterad information som du kan importera till din kalenderapplikation.";
-$labels['eventcancelsubject'] = '"$title" har ställts in';
 $labels['eventcancelmailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHändelsen har ställts in av \$organizer.\n\nHärmed bifogas en iCalendar-fil med uppdaterad information om händelsen.";
 $labels['itipobjectnotfound'] = 'Den händelse som avses i detta meddelande hittades inte i din kalender.';
 $labels['itipmailbodyaccepted'] = "\$sender har accepterat inbjudan till följande händelse:\n\n*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees";
diff --git a/plugins/calendar/localization/th_TH.inc b/plugins/calendar/localization/th_TH.inc
index 43d660ed..255220da 100644
--- a/plugins/calendar/localization/th_TH.inc
+++ b/plugins/calendar/localization/th_TH.inc
@@ -25,6 +25,7 @@ $labels['afterflagdeleted'] = 'ติดธงว่าลบแล้ว';
 $labels['aftermoveto'] = 'ย้ายไปยัง...';
 $labels['itipoptions'] = 'เชิญเข้าร่วมนัดหมาย';
 $labels['afteraction'] = 'ภายหลังการประมวลผลข้อความ คำเชิญ หรือ ปรับปรุงสถานภาพ';
+$labels['weeknonone'] = 'ไม่มีทาง';
 $labels['calendar'] = 'ปฎิทิน';
 $labels['calendars'] = 'ปฎิทิน';
 $labels['category'] = 'หมวดหมู่';
@@ -69,6 +70,7 @@ $labels['mystatus'] = 'สถานะของฉัน';
 $labels['status'] = 'สถานะ';
 $labels['status-confirmed'] = 'ยืนยัน';
 $labels['status-cancelled'] = 'ยกเลิก';
+$labels['status-tentative'] = 'แนวโน้ม';
 $labels['priority'] = 'ความสำคัญ';
 $labels['sensitivity'] = 'ความเป็นส่วนตัว';
 $labels['public'] = 'สาธารณะ';
@@ -86,6 +88,7 @@ $labels['printdescriptions'] = 'พิมพ์คำอธิบาย';
 $labels['parentcalendar'] = 'เพิ่มเข้าภายใต้';
 $labels['searchearlierdates'] = '« ค้นหากำหนดการณ์ที่เกิดชึ้นก่อนหน้า';
 $labels['searchlaterdates'] = 'ค้นหากำหนดการณ์ที่เกิดขึ้นหลังจาก »';
+$labels['laterevents'] = 'ภายหลัง';
 $labels['andnmore'] = 'มีอีก $nr';
 $labels['togglerole'] = 'กดเพื่อเปลี่ยนสลับบทบาท';
 $labels['createfrommail'] = 'บันทึกเป็นเหตุการณ์';
@@ -139,8 +142,6 @@ $labels['availbusy'] = 'ติดธุระ';
 $labels['availunknown'] = 'ไม่ทราบ';
 $labels['availtentative'] = 'แนวโน้ม';
 $labels['availoutofoffice'] = 'ไม่อยู่ออฟฟิศ';
-$labels['delegatedto'] = 'มอบหมายให้';
-$labels['delegatedfrom'] = 'รับมอบจาก';
 $labels['scheduletime'] = 'ค้นหาส่วนที่ว่าง';
 $labels['sendinvitations'] = 'ส่งคำเชิญ';
 $labels['sendnotifications'] = 'แจ้งเตือนผู้เข้าร่วมสำหรับการแก้ไข';
@@ -155,7 +156,6 @@ $labels['invitationsubject'] = 'คุณได้รับเชิญไปย
 $labels['invitationattendlinks'] = "ในกรณีที่โปรแกรมอีเมล์ของคุณไม่รองรับ 'การร้องขอ iTip' คุณสามารถใช้ลิงค์ต่อไปนี้ในการตอบรับหรือปฎิเสธจดหมายเชิญฉบับนี้ :\n\$url";
 $labels['eventupdatesubject'] = '"$title" ได้รับการปรับปรุงสถานะ';
 $labels['eventupdatesubjectempty'] = 'เหตุการณ์ที่คุณเป็นห่วงได้ถูกปรับปรุงสถานะแล้ว';
-$labels['eventcancelsubject'] = '"$title" ถูกยกเลิก';
 $labels['eventcancelmailbody'] = "*\$title*\n\nเมื่อ: \$date\n\nInvitees: \$attendees\n\n เหตุการณ์ได้ถูกยกเลิกโดย \$organizer.\n\n ไฟล์ iCalendar ที่แนบมาด้วย ได้รับการปรับปรุงรายละเอียดเรียบร้อยแล้ว";
 $labels['itipobjectnotfound'] = 'เหตุการณ์ที่อ้างถึงโดยข้อความนี้ไม่ถูกตรวจพบในปฎิทินของคุณ';
 $labels['itipmailbodyaccepted'] = "\$sender ได้ตอบรับคำเชิญสำหรับเหตุการณ์ต่อไปนี้:\n\n*\$title*\n\nเมื่อ: \$date\n\nInvitees: \$attendees";
diff --git a/plugins/calendar/localization/uk_UA.inc b/plugins/calendar/localization/uk_UA.inc
index ac66c683..7436ef8c 100644
--- a/plugins/calendar/localization/uk_UA.inc
+++ b/plugins/calendar/localization/uk_UA.inc
@@ -75,6 +75,7 @@ $labels['mystatus'] = 'Мій статус';
 $labels['status'] = 'Статус';
 $labels['status-confirmed'] = 'Підтверджений';
 $labels['status-cancelled'] = 'Відмінений';
+$labels['status-tentative'] = 'Невизначений';
 $labels['priority'] = 'Пріоритет';
 $labels['sensitivity'] = 'Конфіденційність';
 $labels['public'] = 'публічна';
@@ -147,8 +148,6 @@ $labels['availbusy'] = 'Зайнятий';
 $labels['availunknown'] = 'Невідомо';
 $labels['availtentative'] = 'Невизначений';
 $labels['availoutofoffice'] = 'Поза офісом';
-$labels['delegatedto'] = 'Доручено:';
-$labels['delegatedfrom'] = 'Доручено від:';
 $labels['scheduletime'] = 'Знайти доступних';
 $labels['sendinvitations'] = 'Запросити';
 $labels['sendnotifications'] = 'Повідомити учасників про зміни';
@@ -159,12 +158,10 @@ $labels['nextslot'] = 'Наступний час';
 $labels['suggestedslot'] = 'Пропонований час';
 $labels['noslotfound'] = 'Неможливо знайти вільний час';
 $labels['invitationsubject'] = 'Ви запрошені на ';
-$labels['invitationmailbody'] = "*\$title*\n\nКоли: \$date\n\nЗапрошені: \$attendees\n\nУ вкладенні Ви знайдете файл iCalendar з усіма деталями події, який Ви можете імпортувати у Вашу програму-щоденник.";
 $labels['invitationattendlinks'] = "У разі, якщо Ваш поштовий клієнт не підтримує запити iTip, Ви можете використати дане нижче посилання, щоб прийняти або відхилити це запрошення:\n\$url";
 $labels['eventupdatesubject'] = '"$title" була оновлена';
 $labels['eventupdatesubjectempty'] = 'Подія, яка стосується Вас, була оновленна ';
 $labels['eventupdatemailbody'] = "*\$title*\n\nКоли: \$date\n\nЗапрошені: \$attendees\n\nУ вкладенні Ви знайдете файл iCalendar з усіма змінами у події, який Ви можете імпортувати у Вашу програму-щоденник.";
-$labels['eventcancelsubject'] = '"$title" була відмінена';
 $labels['eventcancelmailbody'] = "*\$title*\n\nКоли: \$date\n\nЗапрошені: \$attendees\n\nЦя подія скасована \$organizer.\n\nУ вкладенні Ви знайдете файл iCalendar з усіма змінами у події.";
 $labels['itipobjectnotfound'] = 'Згадану в даному повідомленні подію, не знайдено у Вашому календарі.';
 $labels['itipdeclineevent'] = 'Ви хочете відхилити запрошення на дану подію?';
diff --git a/plugins/calendar/localization/vi_VN.inc b/plugins/calendar/localization/vi_VN.inc
new file mode 100644
index 00000000..2c18c3d1
--- /dev/null
+++ b/plugins/calendar/localization/vi_VN.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['status-tentative'] = 'Tentative';
+?>
diff --git a/plugins/calendar/localization/zh_CN.inc b/plugins/calendar/localization/zh_CN.inc
index 40f5ee90..360d017c 100644
--- a/plugins/calendar/localization/zh_CN.inc
+++ b/plugins/calendar/localization/zh_CN.inc
@@ -8,9 +8,15 @@
  */
 $labels['default_view'] = '默认视图';
 $labels['time_format'] = '时间格式';
+$labels['timeslots'] = '每小时分成几段';
+$labels['first_day'] = '周几排列在前';
+$labels['first_hour'] = '几点最前显示';
 $labels['workinghours'] = '工作时间';
 $labels['add_category'] = '增加分类';
 $labels['remove_category'] = '移除分类';
+$labels['defaultcalendar'] = '创建事件于';
+$labels['eventcoloring'] = '事件标色';
+$labels['coloringmode0'] = '根据日历';
 $labels['aftertrash'] = '移到回收站';
 $labels['afterdelete'] = '删除此信息';
 $labels['afterflagdeleted'] = '被删除标签';
@@ -36,6 +42,8 @@ $labels['title'] = '汇总';
 $labels['description'] = '描述';
 $labels['export'] = '导出';
 $labels['exporttitle'] = '导出到ICalendar';
+$labels['location'] = '地点';
+$labels['url'] = '网址';
 $labels['date'] = '日期';
 $labels['start'] = '开始';
 $labels['starttime'] = '开始时间';
@@ -51,6 +59,7 @@ $labels['mystatus'] = '我的状态';
 $labels['status'] = '状态';
 $labels['status-confirmed'] = '已确认';
 $labels['status-cancelled'] = '已取消';
+$labels['status-tentative'] = '临时';
 $labels['priority'] = '优先级';
 $labels['sensitivity'] = '隐私';
 $labels['public'] = '公开';
@@ -63,14 +72,49 @@ $labels['created'] = '已创建';
 $labels['changed'] = '最后更改';
 $labels['unknown'] = '未知';
 $labels['eventoptions'] = '选项';
+$labels['eventhistory'] = '历史';
+$labels['searchearlierdates'] = '<< 查找以前的事件';
+$labels['searchlaterdates'] = '查找以后的时间 >>';
+$labels['invitationspending'] = '未决邀请';
+$labels['invitationsdeclined'] = '已拒绝邀请';
+$labels['rsvpcomment'] = '邀请文字';
+$labels['until'] = '直到';
+$labels['today'] = '今天';
+$labels['tomorrow'] = '明天';
+$labels['thisweek'] = '本周';
+$labels['nextweek'] = '下周';
+$labels['prevweek'] = '上周';
+$labels['thismonth'] = '本月';
+$labels['nextmonth'] = '下月';
 $labels['weekofyear'] = '周';
+$labels['pastevents'] = '过去';
+$labels['futureevents'] = '未来';
+$labels['showalarms'] = '显示提醒';
+$labels['defaultalarmtype'] = '默认提醒设置';
+$labels['defaultalarmoffset'] = '默认提醒时间';
+$labels['attendee'] = '参与者';
+$labels['role'] = '身份';
+$labels['availability'] = '有空';
 $labels['confirmstate'] = '状态';
+$labels['addattendee'] = '添加参与者';
+$labels['roleorganizer'] = '组织者';
+$labels['rolerequired'] = '必须';
+$labels['roleoptional'] = '可选';
+$labels['rolenonparticipant'] = '缺席';
+$labels['cutypeindividual'] = '个人';
+$labels['cutypegroup'] = '组织';
+$labels['cutyperesource'] = '资源';
 $labels['availfree'] = '空闲';
 $labels['availbusy'] = '忙碌';
 $labels['availunknown'] = '未知';
 $labels['availtentative'] = '临时';
 $labels['availoutofoffice'] = '外出';
+$labels['scheduletime'] = '查找是否有空';
+$labels['sendinvitations'] = '发送邀请';
+$labels['sendnotifications'] = '通知参加者修改事项';
+$labels['resource'] = '资源';
 $labels['tabsummary'] = '汇总';
 $labels['tabsharing'] = '分享';
 $labels['savingdata'] = '保存数据...';
+$labels['futurevents'] = '未来';
 ?>
diff --git a/plugins/calendar/localization/zh_TW.inc b/plugins/calendar/localization/zh_TW.inc
new file mode 100644
index 00000000..2c18c3d1
--- /dev/null
+++ b/plugins/calendar/localization/zh_TW.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['status-tentative'] = 'Tentative';
+?>
diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js
index 941d04c3..6b7c584c 100644
--- a/plugins/calendar/print.js
+++ b/plugins/calendar/print.js
@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2018, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -34,11 +34,11 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   {
     return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
   };
-  
+
   var rc_loading;
   var showdesc = true;
   var settings = $.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings);
-  
+
   // create list of event sources AKA calendars
   var src, event_sources = [];
   var add_url = (rcmail.env.search ? '&q='+escape(rcmail.env.search) : '');
@@ -52,9 +52,11 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
       id: id
     }, rcmail.env.calendars[id]);
 
+    source.color = '#' + source.color.replace(/^#/, '');
+
     event_sources.push(source);
   }
-  
+
   var viewdate = new Date();
   if (rcmail.env.date)
     viewdate.setTime(rcmail.env.date * 1000);
@@ -166,11 +168,38 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
          }, 20);
     }
   });
-  
+
   // activate settings form
   $('#propdescription').change(function(){
     showdesc = this.checked;
     fc.fullCalendar('render');
   });
 
+  var selector = $('#calendar').data('view-selector');
+  if (selector) {
+    selector = $('#' + selector);
+
+    $('.fc-header-right > span').each(function() {
+      var cl = 'btn btn-secondary', btn = $(this);
+
+      if (btn.is('.fc-state-active')) {
+        cl += ' active';
+      }
+
+      $('<button>').attr({'class': cl, type: 'button'})
+        .text(btn.text())
+        .appendTo(selector)
+          .on('click', function() {
+            selector.children('.active').removeClass('active');
+            $(this).addClass('active');
+            btn.click();
+        });
+    });
+  };
+
+  // Update layout after initialization
+  // In devel mode we have to wait until all styles are applied by less
+  if (rcmail.env.devel_mode && window.less) {
+    less.pageLoadFinished.then(function() { $(window).resize(); });
+  }
 });
diff --git a/plugins/calendar/skins/classic/README b/plugins/calendar/skins/classic/README
deleted file mode 100644
index ccd513ae..00000000
--- a/plugins/calendar/skins/classic/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Icons by Fugue Icons <http://p.yusukekamiyamane.com/>
-
-Copyright (C) 2010 Yusuke Kamiyamane. All rights reserved.
-The icons are licensed under a Creative Commons Attribution
-3.0 license. <http://creativecommons.org/licenses/by/3.0/>
diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
deleted file mode 100644
index c511ff02..00000000
--- a/plugins/calendar/skins/classic/calendar.css
+++ /dev/null
@@ -1,1758 +0,0 @@
-/*** Style for Calendar plugin ***/
-
-body.calendarmain {
-	overflow: hidden;
-}
-
-#taskbar a.button-calendar {
-	background: url(images/calendar.png) 0px 1px no-repeat;
-}
-
-/* hack for IE 6/7 */
-* html #taskbar a.button-calendar {
-	background-image: url(images/calendar.gif);
-}
-
-#main {
-	position: absolute;
-	clear: both;
-	top: 72px;
-	left: 0;
-	right: 0;
-	bottom: 10px;
-}
-
-#calendarsidebar {
-	position: absolute;
-	top: 0px;
-	left: 10px;
-	bottom: 0;
-	width: 230px;
-}
-
-#datepicker {
-	position: relative;
-	top: 42px;
-	width: 100%;
-}
-
-#datepicker .ui-datepicker {
-	width: 97% !important;
-	box-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-}
-
-#datepicker .ui-datepicker-activerange a {
-	border-color: #c33;
-	color: #a22;
-}
-
-#datepicker .ui-datepicker-activerange a.ui-state-active {
-	color: #fff;
-}
-
-#datepicker .ui-priority-secondary {
-	opacity: 0.4;
-}
-
-#datepicker td.ui-datepicker-week-col {
-	cursor: pointer;
-}
-
-#calendarsidebartoggle {
-	position: absolute;
-	left: 244px;
-	width: 8px;
-	top: 4px;
-	bottom: 0;
-	background: url(images/toggle.gif) 0 48% no-repeat transparent;
-	cursor: pointer;
-}
-
-div.sidebarclosed {
-	background-position: -8px 48% !important;
-}
-
-#calendarsidebartoggle:hover {
-	background-color: #ddd;
-}
-
-#calendar {
-	position: absolute;
-	top: 4px;
-	left: 256px;
-	right: 10px;
-	bottom: 0;
-}
-
-#print {
-	width: 680px;
-}
-
-pre {
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-
-#calendars {
-	position: absolute;
-	top: 228px;
-	left: 0;
-	bottom: 0;
-	right: 0;
-	background-color: #F9F9F9;
-	border: 1px solid #999999;
-	overflow: hidden;
-}
-
-#calendars .boxlistcontent {
-	top: 43px;
-}
-
-#calendars .listsearchbox {
-	padding: 2px 4px;
-}
-
-#calendarslist {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-#attachmentlist li,
-#calendarslist li {
-	margin: 0;
-	padding: 1px;
-	display: block;
-	background: #fff;
-	border-bottom: 1px solid #EBEBEB;
-	white-space: nowrap;
-	cursor: default;
-}
-
-#calendars .treelist li {
-	margin: 0;
-	padding: 0;
-	position: relative;
-}
-
-#calendars .treelist ul li:last-child {
-	border-bottom: 0;
-}
-
-#calendars .treelist li div.folder,
-#calendars .treelist li div.calendar {
-	position: relative;
-	height: 22px;
-}
-
-#calendars .treelist li span.calname {
-	display: block;
-	padding: 0px 30px 2px 2px;
-	position: absolute;
-	top: 4px;
-	left: 38px;
-	right: 40px;
-	cursor: default;
-	background: url(images/calendars.png) right 20px no-repeat;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-#calendars .treelist li div.virtual > span.calname {
-	color: #aaa;
-	left: 20px;
-}
-
-#calendars .treelist.flat li span.calname {
-	left: 24px;
-	right: 22px;
-}
-
-#calendars .treelist li span.handle {
-	display: inline-block;
-	position: absolute;
-	top: 5px;
-	right: 6px;
-	padding: 0;
-	width: 12px;
-	height: 12px;
-	border-radius: 3px;
-	font-size: 0.8em;
-}
-
-#calendars .treelist li a.subscribed {
-	display: inline-block;
-	position: absolute;
-	top: 2px;
-	right: 22px;
-	height: 16px;
-	width: 16px;
-	padding: 0;
-	background: url(images/calendars.png) -100px 0 no-repeat;
-	overflow: hidden;
-	text-indent: -5000px;
-	cursor: pointer;
-}
-
-#calendars .treelist div:hover > a.subscribed {
-	background-position: 0 -126px;
-}
-
-#calendars .treelist div.subscribed a.subscribed {
-	background-position: 0 -144px;
-}
-
-#calendars .treelist li input {
-	position: absolute;
-	top: 1px;
-	left: 18px;
-}
-
-#calendars .treelist li div.treetoggle {
-	top: -1px;
-	left: 1px !important;
-}
-
-#calendars .treelist ul li div.treetoggle {
-	left: 17px !important;
-}
-
-#calendars .treelist ul ul li div.treetoggle {
-	left: 33px !important;
-}
-
-#calendars .treelist.flat li input {
-	left: 4px;
-}
-
-#calendars .treelist ul li div.folder,
-#calendars .treelist ul li div.calendar {
-	margin-left: 16px;
-}
-
-#calendars .treelist ul ul li div.folder,
-#calendars .treelist ul ul li div.calendar {
-	margin-left: 32px;
-}
-
-#calendars .treelist ul ul ul li div.folder,
-#calendars .treelist ul ul ul li div.calendar {
-	margin-left: 48px;
-}
-
-#calendars .treelist li.selected {
-	background-color: #ccc;
-}
-
-#calendars .treelist li.selected > span.calname {
-	font-weight: bold;
-}
-
-#calendars .treelist div.readonly span.calname {
-	background-position: right -20px;
-}
-
-#calendars .treelist li.user > div > span.calname {
-	background-position: right -38px;
-}
-
-#calendarslist li.virtual span.calname {
-	color: #666;
-}
-
-#calendars .searchresults .boxtitle {
-	border-top: 1px solid #aaa;
-	margin-bottom: 0;
-}
-
-#calfeedurl,
-#caldavurl {
-	width: 98%;
-	background: #fbfbfb;
-	padding: 4px;
-	margin-bottom: 1em;
-	resize: none;
-}
-
-#agendalist {
-	width: 100%;
-	margin: 0 auto;
-	margin-top: 60px;
-	border: 1px solid #C1DAD7;
-	display: none;
-}
-
-#agendalist table {
-	width: 100%;
-}
-
-#agendalist td,
-#agendalist th {
-	border-right: 1px solid #C1DAD7;
-	border-bottom: 1px solid #C1DAD7;
-	background: #fff;
-	padding: 6px 6px 6px 12px;
-}
-
-#agendalist tr {
-	vertical-align: top;
-}
-
-#agendalist th {
-	font-weight: bold;
-}
-
-#calendartoolbar {
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	height: 35px;
-}
-
-#calendartoolbar a {
-	padding-right: 10px;
-}
-
-#calendartoolbar a.button,
-#calendartoolbar a.buttonPas {
-	display: block;
-	float: left;
-	width: 32px;
-	height: 32px;
-	padding: 0;
-	margin-right: 10px;
-	overflow: hidden;
-	background: url(images/toolbar.png) 0 0 no-repeat transparent;
-	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
-}
-
-#calendartoolbar a.buttonPas {
-	opacity: 0.35;
-}
-
-#calendartoolbar a.addeventSel {
-	background-position: 0 -32px;
-}
-
-#calendartoolbar a.delete {
-  background-position: -32px 0;
-}
-
-#calendartoolbar a.deleteSel {
-  background-position: -32px -32px;
-}
-
-#calendartoolbar a.print {
-  background-position: -64px 0;
-}
-
-#calendartoolbar a.printSel {
-  background-position: -64px -32px;
-}
-
-#calendartoolbar a.import {
-	background-position: -168px 0;
-}
-
-#calendartoolbar a.importSel {
-	background-position: -168px -32px;
-}
-
-#calendartoolbar a.export {
-	background-position: -128px 0;
-}
-
-#calendartoolbar a.exportSel {
-	background-position: -128px -32px;
-}
-
-.calendarmain #quicksearchbar {
-	top: 80px;
-	right: 4px;
-}
-
-#eventedit.uidialog,
-.calendarmain div.uidialog {
-	display: none;
-}
-
-#user {
-	position: absolute;
-	top: 10px;
-	right: 100px;
-	left: 100px;
-	text-align: center;
-}
-
-a.morelink {
-	font-size: 90%;
-	color: #C33;
-	text-decoration: none;
-}
-
-a.morelink:hover {
-	text-decoration: underline;
-}
-
-a.miniColors-trigger {
-	margin-top: -3px;
-}
-
-#attachmentcontainer {
-	position: absolute;
-	top: 80px;
-	left: 20px;
-	right: 20px;
-	bottom: 20px;
-}
-
-#attachmentframe {
-	width: 100%;
-	height: 100%;
-	border: 1px solid #999999;
-	background-color: #F9F9F9;
-}
-
-#partheader {
-	position: absolute;
-	top: 20px;
-	left: 220px;
-	right: 20px;
-	height: 40px;
-}
-
-#partheader table td {
-	padding-left: 2px;
-	padding-right: 4px;
-	vertical-align: middle;
-	font-size: 11px;
-}
-
-#partheader table td.title {
-	color: #666;
-	font-weight: bold;
-}
-
-.attachments-list ul {
-	margin: 0px;
-	padding: 0px;
-	list-style-image: none;
-	list-style-type: none;
-}
-
-.attachments-list ul li {
-	height: 18px;
-	font-size: 12px;
-	padding-top: 2px;
-	padding-right: 8px;
-	white-space: nowrap;
-}
-
-.attachments-list ul li img {
-	padding-right: 2px;
-	vertical-align: middle;
-}
-
-.attachments-list ul li a {
-	text-decoration: none;
-}
-
-.attachments-list ul li a:hover {
-	text-decoration: underline;
-}
-
-#attachmentlist {
-	margin: 0 -0.8em;
-}
-
-#attachmentlist li {
-	padding: 2px 2px 3px 0.8em;
-}
-
-#eventshow .attachments-list ul li {
-	float: left;
-}
-
-#edit-attachments-form {
-	padding-top: 1.2em;
-}
-
-#edit-attachments-form .formbuttons {
-	margin: 0.5em 0;
-}
-
-.event-attendees span.attendee {
-	padding-right: 18px;
-	margin-right: 0.5em;
-	background: url(images/attendee-status.gif) right 0 no-repeat;
-}
-
-.event-attendees span.attendee a.mailtolink {
-	text-decoration: none;
-	white-space: nowrap;
-}
-
-.event-attendees span.attendee a.mailtolink:hover {
-	text-decoration: underline;
-}
-
-.event-attendees span.accepted {
-	background-position: right -20px;
-}
-
-.event-attendees span.declined {
-	background-position: right -40px;
-}
-
-.event-attendees span.tentative {
-	background-position: right -60px;
-}
-
-.event-attendees span.delegated {
-	background-position: right -180px;
-}
-
-.event-attendees span.organizer {
-	background-position: right -80px;
-}
-
-#all-event-attendees span.attendee {
-	display: block;
-	margin-bottom: 4px;
-	padding-bottom: 3px;
-	border-bottom: 1px solid #ddd;
-}
-
-/* jQuery UI overrides */
-
-.calendarmain .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: left;
-}
-
-#eventshow h1 {
-	font-size: 20px;
-	margin: 0.1em 0 0.4em 0;
-}
-
-#eventshow label,
-#eventshow h5.label {
-	font-weight: normal;
-	font-size: 0.9em;
-	color: #999;
-	margin: 0 0 0.2em 0;
-}
-
-#eventshow {
-	margin: 0 -0.2em;
-}
-
-#eventshow.status-cancelled {
-	background: url(images/badge_cancelled.png) top right no-repeat;
-}
-
-#eventshow.sensitivity-private {
-	background: url(images/badge_private.png) top right no-repeat;
-}
-
-#eventshow.sensitivity-confidential {
-	background: url(images/badge_confidential.png) top right no-repeat;
-}
-
-.sensitivity-private #event-title {
-	margin-right: 50px;
-}
-
-.sensitivity-confidential #event-title {
-	margin-right: 60px;
-}
-
-#eventshow div.event-line {
-	margin-top: 0.1em;
-	margin-bottom: 0.3em;
-}
-
-#eventshow #event-url .event-text {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-#event-rsvp .itip-reply-controls {
-	margin-top: 0.5em;
-}
-
-#eventshow .itip-reply-controls label {
-	font-size: 1em;
-	color: #333;
-}
-
-#event-partstat .changersvp {
-	cursor: pointer;
-	color: #333;
-	text-decoration: none;
-}
-
-#event-partstat:hover .changersvp {
-	text-decoration: underline;
-}
-
-#event-partstat .changersvp.accepted {
-	color: #589b1e;
-}
-
-#event-partstat .changersvp.tentative {
-	color: #f0bb1d;
-}
-
-#event-partstat .changersvp.declined {
-	color: #ea0000;
-}
-
-#event-partstat .changersvp.delegated {
-	color: #018be9;
-}
-
-#eventedit {
-	position: relative;
-	padding: 0.5em 0.1em;
-}
-
-#eventedit input.text,
-#eventedit textarea {
-	width: 97%;
-}
-
-#eventtabs {
-	position: relative;
-	padding: 0;
-	border: 0;
-	border-radius: 0;
-}
-
-div.form-section,
-#eventshow div.event-section,
-#eventtabs div.event-section {
-	margin-top: 0.2em;
-	margin-bottom: 0.8em;
-}
-
-#eventtabs .tabsbar {
-	position: absolute;
-	top: 0;
-}
-
-#eventtabs .ui-tabs-panel {
-	padding: 1em 0.8em;
-	border: 1px solid #aaa;
-	border-width: 0 1px 1px 1px;
-}
-
-#eventtabs .ui-tabs-nav {
-	background: none;
-	padding: 0;
-	border-width: 0 0 1px 0;
-	border-radius: 0;
-}
-
-#eventtabs .border-after {
-	padding-bottom: 0.6em;
-	margin-bottom: 0.6em;
-	border-bottom: 1px solid #999;
-}
-
-#eventshow label,
-#eventedit label,
-.form-section label {
-	display: inline-block;
-	min-width: 7em;
-	padding-right: 0.5em;
-}
-
-#eventedit .formtable td.label {
-	min-width: 6em;
-}
-
-td.topalign {
-	vertical-align: top;
-}
-
-#eventedit .edit-alarm-item {
-	position: relative;
-	padding-right: 30px;
-	margin-bottom: 2px;
-}
-
-#eventedit .edit-alarm-buttons {
-	position: absolute;
-	top: 2px;
-	right: 0;
-}
-
-#eventedit .edit-alarm-buttons a.iconlink {
-	display: none;
-	width: 18px;
-	height: 17px;
-	padding: 1px;
-	text-indent: -5000px;
-	overflow: hidden;
-}
-
-#eventedit .edit-alarm-buttons a.add-alarm {
-	background: url(images/plus.png) 1px 1px no-repeat;
-}
-
-#eventedit .edit-alarm-buttons a.delete-alarm {
-	background: url(images/delete.png) 1px 1px no-repeat;
-}
-
-#eventedit .edit-alarm-buttons a.delete-alarm,
-#eventedit .first .edit-alarm-buttons a.add-alarm {
-	display: inline-block;
-}
-
-#eventedit .first .edit-alarm-buttons a.delete-alarm {
-	display: none;
-}
-
-#eventedit label.weekday,
-#eventedit label.monthday {
-	min-width: 3em;
-}
-
-#eventedit label.month {
-	min-width: 5em;
-}
-
-#edit-recurrence-yearly-bymonthblock {
-	margin-left: 7.5em;
-}
-
-#edit-recurrence-rdates {
-	display: block;
-	list-style: none;
-	margin: 0 0 0.8em 0;
-	padding: 0;
-	max-height: 300px;
-	overflow: auto;
-}
-
-#edit-recurrence-rdates li {
-	display: block;
-	position: relative;
-	width: 14em;
-	padding: 1px;
-}
-
-#edit-recurrence-rdates li a.delete {
-	position: absolute;
-	top: 1px;
-	right: 0;
-}
-
-#eventedit .recurrence-form {
-	display: none;
-}
-
-#eventedit .formtable td {
-	padding: 0.2em 0;
-}
-
-.ui-dialog .event-update-confirm {
-	padding: 0 0.5em 0.5em 0.5em;
-}
-
-.event-dialog-message,
-.event-update-confirm .message {
-	margin-top: 0.5em;
-	padding: 0.8em;
-	background-color: #F7FDCB;
-	border: 1px solid #C2D071;
-}
-
-.event-dialog-message .message,
-.event-update-confirm .message {
-	margin-bottom: 0.5em;
-}
-
-.edit-recurring-warning .savemode {
-	padding-left: 20px;
-}
-
-.event-update-confirm .savemode {
-	padding-left: 30px;
-}
-
-.event-dialog-message span.ui-icon,
-.event-update-confirm span.ui-icon {
-	float: left;
-	margin: 0 7px 20px 0;
-}
-
-.event-dialog-message label,
-.event-update-confirm label {
-	min-width: 3em;
-	padding-right: 1em;
-}
-
-.event-update-confirm a.button {
-	margin: 0 0.5em 0 0.2em;
-	min-width: 5em;
-}
-
-#event-rsvp,
-#edit-attendees-notify {
-	margin: 0.3em 0;
-	padding: 0.5em;
-	background-color: #F7FDCB;
-	border: 1px solid #C2D071;
-}
-
-.edit-attendees-table {
-	width: 100%;
-	display: table;
-	table-layout: fixed;
-	border-collapse: collapse;
-	border: 1px solid #ccc;
-}
-
-.edit-attendees-table th,
-.edit-attendees-table td {
-	padding: 3px;
-	border-bottom: 1px solid #ccc;
-	text-align: left;
-}
-
-.edit-attendees-table th.role,
-.edit-attendees-table td.role {
-	width: 8em;
-}
-
-.edit-attendees-table th.availability,
-.edit-attendees-table th.confirmstate,
-.edit-attendees-table td.availability,
-.edit-attendees-table td.confirmstate {
-	width: 4em;
-}
-
-.edit-attendees-table th.options,
-.edit-attendees-table td.options {
-	width: 2em;
-	text-align: right;
-	padding-right: 4px;
-}
-
-.edit-attendees-table th.invite,
-.edit-attendees-table td.invite {
-	width: 24px;
-	padding: 2px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: hidden;
-}
-
-#eventedit .edit-attendees-table th.invite label {
-	display: none;
-}
-
-.edit-attendees-table th.name,
-.edit-attendees-table td.name {
-	width: auto;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.edit-attendees-table thead th,
-.edit-attendees-table thead td {
-	background: url(images/listheader.gif) top left repeat-x #CCC;
-}
-
-#edit-attendees-form,
-#edit-resources-form {
-	position: relative;
-	margin-top: 1em;
-}
-
-#edit-attendees-form #edit-attendee-schedule,
-#edit-resources-form #edit-resource-find {
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-.edit-attendees-table select.edit-attendee-role {
-	border: 0;
-	padding: 2px;
-	background: white;
-}
-
-.availability img.availabilityicon {
-	margin: 1px;
-	width: 14px;
-	height: 14px;
-	border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-
-.availability img.availabilityicon.loading {
-	background: url(images/loading_blue.gif) center no-repeat;
-}
-
-#schedule-freebusy-times td.unknown,
-.availability img.availabilityicon.unknown {
-	background: #ddd;
-}
-
-#schedule-freebusy-times td.free,
-.availability img.availabilityicon.free {
-	background: #0c0;
-}
-
-#schedule-freebusy-times td.busy,
-.availability img.availabilityicon.busy {
-	background: #c00;
-}
-
-#schedule-freebusy-times td.tentative,
-.availability img.availabilityicon.tentative {
-	background: #66d;
-}
-
-#schedule-freebusy-times td.out-of-office,
-.availability img.availabilityicon.out-of-office {
-	background: #f0b400;
-}
-
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
-	background-image: url(images/freebusy-colors.png);
-	background-position: top right;
-	background-repeat: no-repeat;
-}
-
-#schedule-freebusy-times td.all-tentative {
-	background-position: right -40px;
-}
-
-#schedule-freebusy-times td.all-out-of-office {
-	background-position: right -80px;
-}
-
-#edit-attendees-legend {
-	margin-top: 3em;
-	margin-bottom: 0.5em;
-}
-
-#edit-attendees-legend .legend {
-	margin-right: 2em;
-	white-space: nowrap;
-}
-
-#edit-attendees-legend img.availabilityicon {
-	vertical-align: middle;
-}
-
-.edit-attendees-table tbody td.confirmstate {
-	overflow: hidden;
-	white-space: nowrap;
-	text-indent: -2000%;
-}
-
-.edit-attendees-table td.confirmstate span {
-	display: block;
-	width: 20px;
-	background: url(images/attendee-status.gif) 5px 0 no-repeat;
-}
-
-.edit-attendees-table td.confirmstate span.needs-action {
-}
-
-.edit-attendees-table td.confirmstate span.accepted {
-	background-position: 5px -20px;
-}
-
-.edit-attendees-table td.confirmstate span.declined {
-	background-position: 5px -40px;
-}
-
-.edit-attendees-table td.confirmstate span.tentative {
-	background-position: 5px -60px;
-}
-
-.edit-attendees-table td.confirmstate span.delegated {
-	background-position: 5px -180px;
-}
-
-#attendees-freebusy-table {
-	width: 100%;
-	table-layout: fixed;
-	border-collapse: collapse;
-	margin: 0.5em 0;
-}
-
-#attendees-freebusy-table td.attendees {
-	width: 18em;
-	border: 1px solid #ccc;
-	vertical-align: top;
-	overflow: hidden;
-}
-
-#attendees-freebusy-table td.times {
-	width: auto;
-	vertical-align: top;
-	border: 1px solid #ccc;
-}
-
-#attendees-freebusy-table div.scroll {
-	position: relative;
-	overflow: auto;
-}
-
-#attendees-freebusy-table h3.boxtitle {
-	margin: 0;
-	height: auto !important;
-	border-color: #ccc;
-}
-
-.attendees-list .attendee {
-	padding: 3px 4px 3px 1px;
-	background: url(images/attendee-status.gif) 2px -97px no-repeat;
-	white-space: nowrap;
-}
-
-.attendees-list a.attendee-role-toggle {
-	display: inline-block;
-	width: 16px;
-	margin-right: 3px;
-	cursor: pointer;
-}
-
-.attendees-list div.attendee {
-	border-top: 1px solid #ccc;
-}
-
-.attendees-list span.attendee {
-	padding-left: 20px;
-	margin-right: 2em;
-}
-
-.attendees-list .organizer {
-	background-position: 3px -77px;
-}
-
-.attendees-list .opt-participant {
-	background-position: 2px -117px;
-}
-
-.attendees-list .non-participant {
-	background-position: 2px -137px;
-}
-
-.attendees-list .chair {
-	background-position: 2px -157px;
-}
-
-.attendees-list .loading {
-	background: url(images/loading_blue.gif) 1px 50% no-repeat;
-}
-
-.attendees-list .total {
-	background: none;
-	padding-left: 4px;
-	font-weight: bold;
-}
-
-.attendees-list .spacer,
-#schedule-freebusy-times tr.spacer td {
-	background: 0;
-	font-size: 50%;
-}
-
-#schedule-freebusy-times {
-	border-collapse: collapse;
-	width: 100%;
-}
-
-#schedule-freebusy-times td {
-	padding: 3px;
-	border: 1px solid #ccc;
-}
-
-#schedule-freebusy-times tr.dates th {
-	border-color: #aaa;
-	border-style: solid;
-	border-width: 0 1px 0 1px;
-	white-space: nowrap;
-}
-
-#attendees-freebusy-table div.timesheader,
-#schedule-freebusy-times tr.times td {
-	min-width: 30px;
-	font-size: 9px;
-	padding: 5px 2px 6px 2px;
-	text-align: center;
-}
-
-#schedule-freebusy-times tr.times td.allday {
-	min-width: 60px;
-}
-
-#schedule-freebusy-times tr.times td {
-	cursor: pointer;
-}
-
-#schedule-event-time {
-	position: absolute;
-	border: 2px solid #333;
-	background: #777;
-	background: rgba(60, 60, 60, 0.6);
-	opacity: 0.5;
-	border-radius: 4px;
-	cursor: move;
-	filter: alpha(opacity=40); /* IE8 */
-}
-
-#eventfreebusy .schedule-options {
-	position: relative;
-	margin-bottom: 1.5em;
-}
-
-#eventfreebusy .schedule-buttons {
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-#eventfreebusy .schedule-find-buttons {
-	padding-bottom:0.5em;
-}
-
-#eventfreebusy .schedule-find-buttons button {
-	min-width: 9em;
-	text-align: center;
-}
-
-span.edit-alarm-set {
-	white-space: nowrap;
-}
-
-a.dropdown-link {
-	color: #CC0000;
-	font-size: 12px;
-	text-decoration: none;
-}
-
-a.dropdown-link:after {
-	content: ' ▼';
-	font-size: 11px;
-	color: #666;
-}
-
-#eventedit .ui-tabs-panel {
-	min-height: 20em;
-}
-
-.alarm-item {
-	margin: 0.4em 0 1em 0;
-}
-
-.alarm-item .event-title {
-	font-size: 14px;
-	margin: 0.1em 0 0.3em 0;
-}
-
-.alarm-item div.event-section {
-	margin-top: 0.1em;
-	margin-bottom: 0.3em;
-}
-
-.alarm-item .alarm-actions {
-	margin-top: 0.4em;
-}
-
-.alarm-item div.alarm-actions a {
-	color: #CC0000;
-	margin-right: 0.8em;
-	text-decoration: none;
-}
-
-a.alarm-action-snooze:after {
-	content: ' ▼';
-	font-size: 10px;
-	color: #666;
-}
-
-#alarm-snooze-dropdown {
-	z-index: 5000;
-}
-
-.ui-dialog-buttonset a.dropdown-link {
-	margin-right: 1em;
-}
-
-.ui-datepicker-calendar .ui-datepicker-today .ui-state-default {
-	border-color: #cccccc;
-	background: #ffffcc;
-	color: #000;
-}
-
-.ui-datepicker-calendar .ui-datepicker-week-col {
-	text-align: right;
-	padding-right: 0.5em;
-}
-
-.ui-datepicker th {
-    padding: 0.3em 0;
-    font-size: 10px;
-}
-
-.ui-datepicker td span,
-.ui-datepicker td a {
-	padding-left: 0.1em;
-}
-
-.ui-autocomplete {
-	max-height: 160px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-.ui-autocomplete .ui-menu-item {
-	white-space: nowrap;
-}
-
-* html .ui-autocomplete {
-	height: 160px;
-}
-
-span.spacer {
-	padding-left: 3em;
-}
-
-#agendaoptions {
-	position: absolute;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	height: auto;
-	z-index: 200;
-	border: 1px solid #ccc;
-	padding: 2px 5px 1px;
-	font-size: 90%;
-}
-
-#agendaoptions label {
-	color: #444;
-	text-shadow: 1px 1px #eee;
-	padding-right: 0.5em;
-}
-
-#calendar-kolabform {
-	position: relative;
-	padding-top: 24px;
-	margin: 0 -8px;
-	min-width: 660px;
-	min-height: 400px;
-}
-
-#calendar-kolabform div.tabsbar {
-	top: 0;
-	right: 2px;
-	left: 2px;
-	height: 24px;
-}
-
-#calendar-kolabform fieldset.tabbed {
-	background-color: #fff;
-	margin-top: 0;
-}
-
-#calendar-kolabform span.tablink {
-	background-color: #e8e8e9;
-	background-image: -moz-linear-gradient(center top, #f4f4f4, #e6e6e6);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #f4f4f4), color-stop(1.0, #e6e6e6));
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr=#f4f4f4, endColorstr=#e6e6e6, GradientType=0);
-	height: 24px !important;
-}
-
-#calendar-kolabform span.tablink-selected {
-	background: #fff;
-	height: 25px !important;
-}
-
-#calendar-kolabform span.tablink a,
-#calendar-kolabform span.tablink-selected a {
-	background: none;
-	border: 1px solid #AAAAAA;
-	border-top-left-radius: 2px;
-	border-top-right-radius: 2px;
-	padding: 4px 10px 0 10px;
-	margin-left: 0;
-}
-
-#calendar-kolabform table td.title {
-  font-weight: bold;
-  white-space: nowrap;
-  color: #666;
-  padding-right: 10px;
-}
-
-#resource-dialog-right {
-	position: absolute;
-	top: 10px;
-	left: 300px;
-	right: 8px;
-	bottom: 10px;
-}
-
-#resource-info,
-#resource-availability {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	height: 48%;
-	border: 1px solid #999;
-	background-color: #F9F9F9;
-	overflow: auto;
-}
-
-#resource-availability {
-	top: auto;
-	bottom: 0;
-	height: 49%;
-	overflow: hidden;
-}
-
-#resource-info .boxtitle,
-#resource-availability .boxtitle {
-	margin-top: 0;
-}
-
-#resource-freebusy-calendar {
-	position: absolute;
-	top: 20px;
-	left: -1px;
-	right: -1px;
-	bottom: -1px;
-}
-
-#resource-freebusy-calendar .fc-content {
-	top: 0;
-}
-
-#resource-freebusy-calendar .fc-content .fc-event-bg {
-	background: 0;
-}
-
-#resource-freebusy-calendar .fc-event.status-busy,
-#resource-freebusy-calendar .status-busy .fc-event-skin {
-	border-color: #e26569;
-	background-color: #e26569;
-}
-
-#resource-freebusy-calendar .fc-event.status-tentative,
-#resource-freebusy-calendar .status-tentative .fc-event-skin {
-	border-color: #8383fc;
-	background: #8383fc;
-}
-
-#resource-freebusy-calendar .fc-event.status-outofoffice,
-#resource-freebusy-calendar .status-outofoffice .fc-event-skin {
-	border-color: #fbaa68;
-	background: #fbaa68;
-}
-
-#resources-list div.treetoggle {
-	left: 3px !important;
-	top: -2px;
-}
-
-#resources-list li ul div.treetoggle {
-	left: 23px !important;
-}
-
-#resource-selection {
-  position: absolute;
-	top: 10px;
-	bottom: 10px;
-	left: 8px;
-	width: 280px;
-	border: 1px solid #999999;
-	background-color: #F9F9F9;
-	overflow: hidden;
-}
-
-#resource-selection .boxlistcontent {
-	top: 25px;
-	border-top: 1px solid #eee;
-}
-
-#resourcequicksearch {
-	position: absolute;
-	top: 3px;
-	left: 7px;
-	right: 4px;
-	height: 17px;
-	background: #fff;
-	border: 1px solid #888;
-	border-radius: 10px;
-	-webkit-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
-	box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
-}
-
-#resourcesearchbox {
-	position: absolute;
-	top: 1px;
-	left: 24px;
-	width: 140px;
-	height: 15px;
-	font-size: 11px;
-	padding: 0px;
-	border: none;
-	outline: none;
-	background: #fff;
-}
-
-#resourcesearchreset {
-	position: absolute;
-	top: 2px;
-	right: 2px;
-	text-decoration: none;
-}
-
-#resource-details,
-#resource-details-owner {
-	margin: 8px;
-}
-
-#resource-details td.title,
-#resource-details-owner td.title {
-	color: #666;
-	padding-right: 10px;
-	min-width: 10em;
-}
-
-#resource-details-owner thead td {
-	color: #333;
-	font-size: 13px;
-	font-weight: bold;
-}
-
-/* fullcalendar style overrides */
-
-#calendar .fc-header-right {
-	padding-right: 200px;
-	padding-top: 0;
-}
-
-.rcube-fc-content {
-	position: absolute !important;
-	top: 38px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	overflow: hidden;
-}
-
-.fc-event-title {
-	font-weight: bold;
-}
-
-.cal-event-status-cancelled .fc-event-title {
-	text-decoration: line-through;
-}
-
-.fc-event-hori .fc-event-title {
-	font-weight: normal;
-	white-space: nowrap;
-}
-
-.fc-event-hori .fc-event-time {
-	white-space: nowrap;
-	font-weight: normal !important;
-	font-size: 10px;
-	padding-right: 0.6em;
-}
-
-.fc-event-vert.fc-invitation-needs-action,
-.fc-event-hori.fc-invitation-needs-action {
-	border: 1px dashed #5757c7 !important;
-}
-
-.fc-event-vert.fc-invitation-tentative,
-.fc-event-hori.fc-invitation-tentative {
-	border: 1px dashed #eb8900 !important;
-}
-
-.fc-event-vert.fc-invitation-declined,
-.fc-event-hori.fc-invitation-declined {
-	border: 1px dashed #c00 !important;
-}
-
-.fc-grid .fc-event-time {
-	font-weight: normal !important;
-	padding-right: 0.3em;
-}
-
-.fc-event-cateories {
-	font-style:italic; 
-}
-
-.fc-event-location {
-	font-size: 90%;
-}
-
-.fc-more-link {
-	color: #999;
-	padding-top: 1px;
-	cursor: pointer;
-}
-
-.fc-agenda-slots td div {
-	height: 22px;
-}
-
-.fc-mon, .fc-tue, .fc-wed, .fc-thu, .fc-fri {
-	background-color: #fdfdfd;
-}
-
-.fc-widget-header {
-	background-color: #fff;
-}
-
-.fc-icon-alarms,
-.fc-icon-sensitive,
-.fc-icon-recurring {
-	display: inline-block;
-	width: 11px;
-	height: 11px;
-	background: url(images/eventicons.gif) 0 0 no-repeat;
-	margin-left: 3px;
-	line-height: 10px;
-}
-
-.fc-icon-alarms {
-	background-position: 0 -13px;
-}
-
-.fc-icon-sensitive {
-	background-position: 0 -25px;
-}
-
-.fc-list-section .fc-event {
-	cursor: pointer;
-}
-
-#calendar .fc-event-vert .fc-event-head,
-#calendar .fc-event-vert .fc-event-content {
-	position: relative;
-	z-index: 2;
-	width: 100%;
-	overflow: hidden;
-}
-
-.fc-view-list div.fc-list-header,
-.fc-view-table td.fc-list-header,
-.edit-attendees-table thead td {
-	padding: 3px;
-	background: #dddddd;
-	background-image: -moz-linear-gradient(center top, #f4f4f4, #d2d2d2);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.00, #f4f4f4), color-stop(1.00, #d2d2d2));
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr=#f4f4f4, endColorstr=#d2d2d2, GradientType=0);
-	font-weight: bold;
-	color: #333;
-}
-
-.fc-view-list .fc-event-skin .fc-event-content {
-	background: #F6F6F6;
-	padding: 2px;
-}
-
-.fc-view-list .fc-event-skin .fc-event-title,
-.fc-view-list .fc-event-skin .fc-event-location {
-	color: #333;
-}
-
-.fc-view-table table.fc-list-smart {
-	table-layout: auto;
-}
-
-.fc-listappend {
-	text-align: center;
-	margin: 1em 0;
-}
-
-.fc-listappend .message {
-	padding: 0.5em;
-	margin-bottom: 0.5em;
-	font-size: 150%;
-	color: #999;
-}
-
-.fc-listappend .formlinks a {
-	font-size: 12px;
-	padding: 0 0.3em;
-}
-
-.fc-event-temp {
-	opacity: 0.4;
-	filter: alpha(opacity=40); /* IE8 */
-}
-
-/* Settings section */
-
-fieldset #calendarcategories div {
-	margin-bottom: 0.3em;
-}
-
-/* Invitation UI in mail */
-
-.messagelist tbody .attachment span.ical {
-	display: inline-block;
-	vertical-align: middle;
-	height: 18px;
-	width: 20px;
-	padding: 0;
-	background: url(images/calendar-small.png) 1px 1px no-repeat;
-}
-
-#messagemenu li a.calendarlink,
-#attachmentmenu li a.calendarlink {
-	background-image: url(images/calendars.png);
-	background-position: 7px -109px;
-	background-repeat: no-repeat;
-}
-
-div.calendar-invitebox {
-	min-height: 20px;
-	margin: 5px 8px;
-	padding: 3px 6px 6px 34px;
-	border: 1px solid #C2D071;
-	background: url(images/calendar.png) 6px 5px no-repeat #F7FDCB;
-}
-
-div.calendar-invitebox td.ititle {
-	font-weight: bold;
-	padding-right: 0.5em;
-}
-
-div.calendar-invitebox td.label {
-	color: #666;
-	padding-right: 1em;
-}
-
-#event-rsvp .rsvp-buttons,
-div.calendar-invitebox .itip-buttons div {
-	margin-top: 0.5em;
-}
-
-#event-rsvp input.button,
-div.calendar-invitebox input.button,
-div.calendar-invitebox select {
-	font-size: 11px;
-	margin-right: 0.5em;
-}
-
-div.calendar-invitebox .folder-select {
-	font-size: 11px;
-	margin-left: 1em;
-}
-
-div.calendar-invitebox .rsvp-status.loading {
-	color: #666;
-	padding: 1px 0 2px 24px;
-	background: url(images/loading_blue.gif) top left no-repeat;
-}
-
-div.calendar-invitebox .rsvp-status.declined,
-div.calendar-invitebox .rsvp-status.tentative,
-div.calendar-invitebox .rsvp-status.delegated,
-div.calendar-invitebox .rsvp-status.accepted {
-	padding: 0 0 1px 22px;
-	background: url(images/attendee-status.gif) 2px -20px no-repeat;
-}
-
-div.calendar-invitebox .rsvp-status.declined {
-	background-position: 2px -40px;
-}
-
-div.calendar-invitebox .rsvp-status.tentative {
-	background-position: 2px -60px;
-}
-
-div.calendar-invitebox .rsvp-status.delegated {
-	background-position: 2px -180px;
-}
-
-div.calendar-invitebox .calendar-agenda-preview {
-	display: none;
-	border-top: 1px solid #dfdfdf;
-	margin-top: 1em;
-	padding-top: 0.6em;
-}
-
-div.calendar-invitebox .calendar-agenda-preview h3.preview-title {
-	margin: 0 0 0.5em 0;
-	font-size: 12px;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-row {
-	color: #777;
-	padding: 2px 0;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-row.current {
-	color: #000;
-	font-weight: bold;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-row.no-event {
-	font-style: italic;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-date {
-	display: inline-block;
-	min-width: 8em;
-	margin-right: 1em;
-	white-space: nowrap;
-}
-
-/* iTIP attend reply page */
-
-.calendaritipattend .centerbox {
-	width: 40em;
-	margin: 80px auto;
-	padding: 10px 10px 10px 90px;
-	border: 1px solid #ccc;
-	box-shadow: 1px 1px 24px #ccc;
-	-moz-box-shadow: 1px 1px 18px #ccc;
-	-webkit-box-shadow: #ccc 1px 1px 18px;
-	background: url(images/invitation.png) 10px 10px no-repeat #fbfbfb;
-}
-
-.calendaritipattend .calendar-invitebox {
-	background: none;
-	padding-left: 0;
-	border: 0;
-	margin: 0 0 2em 0;
-}
-
-.calendaritipattend .calendar-invitebox .rsvp-status {
-	margin-top: 2.5em;
-	font-size: 110%;
-	font-weight: bold;
-}
-
-.calendaritipattend .calendar-invitebox td.title,
-.calendaritipattend .calendar-invitebox td.ititle {
-	font-size: 120%;
-}
-
diff --git a/plugins/calendar/skins/classic/fullcalendar.css b/plugins/calendar/skins/classic/fullcalendar.css
deleted file mode 120000
index 4adce7a2..00000000
--- a/plugins/calendar/skins/classic/fullcalendar.css
+++ /dev/null
@@ -1 +0,0 @@
-../larry/fullcalendar.css
\ No newline at end of file
diff --git a/plugins/calendar/skins/classic/iehacks.css b/plugins/calendar/skins/classic/iehacks.css
deleted file mode 100644
index 42bd7361..00000000
--- a/plugins/calendar/skins/classic/iehacks.css
+++ /dev/null
@@ -1,88 +0,0 @@
-/* CSS hacks for IE 6/7 */
-
-#main {
-	width: expression(Math.max(300, parseInt(document.documentElement.clientWidth)-10)+'px');
-	height: expression(Math.max(300, parseInt(document.documentElement.clientHeight)-100)+'px');
-}
-
-#calendarsidebar,
-#calendarsidebartoggle {
-	height: expression((parseInt(this.parentNode.offsetHeight)-37)+'px');
-}
-
-#calendar {
-	width: expression((parseInt(this.parentNode.offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetLeft)-4)+'px');
-	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
-}
-
-#calendars {
-	height: expression((parseInt(this.parentNode.offsetHeight)-220)+'px');
-}
-
-#agendaoptions {
-	width: expression((parseInt(this.parentNode.offsetWidth)-12)+'px');
-}
-
-#calendartoolbar a.buttonPas {
-	filter: alpha(opacity=35);
-}
-
-html #calendartoolbar a.button,
-html #calendartoolbar a.buttonPas {
-	background-image: url(images/toolbar.gif);
-}
-
-#datepicker a.ui-priority-secondary {
-	filter: alpha(opacity=40);
-}
-
-#calendarslist li span.handle {
-	background-image: url(images/calendars.gif);
-}
-
-#datepicker .ui-widget-header {
-	width: 102%;
-}
-
-#eventshow.sensitivity-private {
-	background-image: url(images/badge_private.gif);
-}
-
-#eventshow.sensitivity-confidential {
-	background-image: url(images/badge_confidential.gif);
-}
-
-.fc-day-content {
-	cursor: default;
-}
-
-.fc-header-title h2 {
-	font-size: 16px;
-}
-
-.fc-event-temp .fc-event-bg {
-	display: none; /* nested opacity filters while dragging don't work */
-}
-
-#schedule-event-time {
-	filter: alpha(opacity=40);
-}
-
-#eventfreebusy .schedule-buttons,
-#edit-attendees-form #edit-attendee-schedule {
-	right: 0.6em;
-}
-
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
-	background-image: url('images/freebusy-colors.gif');
-}
-
-#schedule-freebusy-times tr.times td.allday {
-	width: expression(Math.max(60, parseInt(this.offsetWidth))+'px');
-}
-
-.ui-dialog .ui-dialog-titlebar {
-	width: expression((parseInt(this.parentNode.offsetWidth)-26)+'px');
-}
diff --git a/plugins/calendar/skins/classic/images/attendee-status.gif b/plugins/calendar/skins/classic/images/attendee-status.gif
deleted file mode 100644
index fd3b9266..00000000
Binary files a/plugins/calendar/skins/classic/images/attendee-status.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/badge_cancelled.png b/plugins/calendar/skins/classic/images/badge_cancelled.png
deleted file mode 100644
index b89029e0..00000000
Binary files a/plugins/calendar/skins/classic/images/badge_cancelled.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/badge_confidential.gif b/plugins/calendar/skins/classic/images/badge_confidential.gif
deleted file mode 100644
index ce6b2a06..00000000
Binary files a/plugins/calendar/skins/classic/images/badge_confidential.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/badge_confidential.png b/plugins/calendar/skins/classic/images/badge_confidential.png
deleted file mode 100644
index e12e788e..00000000
Binary files a/plugins/calendar/skins/classic/images/badge_confidential.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/badge_private.gif b/plugins/calendar/skins/classic/images/badge_private.gif
deleted file mode 100644
index 900ed733..00000000
Binary files a/plugins/calendar/skins/classic/images/badge_private.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/badge_private.png b/plugins/calendar/skins/classic/images/badge_private.png
deleted file mode 100644
index acf32070..00000000
Binary files a/plugins/calendar/skins/classic/images/badge_private.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/calendar-blue.png b/plugins/calendar/skins/classic/images/calendar-blue.png
deleted file mode 100644
index 95c9452c..00000000
Binary files a/plugins/calendar/skins/classic/images/calendar-blue.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/calendar.gif b/plugins/calendar/skins/classic/images/calendar.gif
deleted file mode 100644
index 4b25de07..00000000
Binary files a/plugins/calendar/skins/classic/images/calendar.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/calendar.png b/plugins/calendar/skins/classic/images/calendar.png
deleted file mode 100644
index caab8a38..00000000
Binary files a/plugins/calendar/skins/classic/images/calendar.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/calendars.gif b/plugins/calendar/skins/classic/images/calendars.gif
deleted file mode 100644
index c560e742..00000000
Binary files a/plugins/calendar/skins/classic/images/calendars.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/calendars.png b/plugins/calendar/skins/classic/images/calendars.png
deleted file mode 100644
index e411c418..00000000
Binary files a/plugins/calendar/skins/classic/images/calendars.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/delete.png b/plugins/calendar/skins/classic/images/delete.png
deleted file mode 100644
index 553ae437..00000000
Binary files a/plugins/calendar/skins/classic/images/delete.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/eventicons.gif b/plugins/calendar/skins/classic/images/eventicons.gif
deleted file mode 100644
index 7adbdeb7..00000000
Binary files a/plugins/calendar/skins/classic/images/eventicons.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/export.png b/plugins/calendar/skins/classic/images/export.png
deleted file mode 100644
index d02781d8..00000000
Binary files a/plugins/calendar/skins/classic/images/export.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/freebusy-colors.gif b/plugins/calendar/skins/classic/images/freebusy-colors.gif
deleted file mode 100644
index 699f4b9c..00000000
Binary files a/plugins/calendar/skins/classic/images/freebusy-colors.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/freebusy-colors.png b/plugins/calendar/skins/classic/images/freebusy-colors.png
deleted file mode 100644
index ca37cd08..00000000
Binary files a/plugins/calendar/skins/classic/images/freebusy-colors.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/ical-attachment.png b/plugins/calendar/skins/classic/images/ical-attachment.png
deleted file mode 100755
index 8dbd6694..00000000
Binary files a/plugins/calendar/skins/classic/images/ical-attachment.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/invitation.png b/plugins/calendar/skins/classic/images/invitation.png
deleted file mode 100644
index f3df83a7..00000000
Binary files a/plugins/calendar/skins/classic/images/invitation.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/listheader.gif b/plugins/calendar/skins/classic/images/listheader.gif
deleted file mode 100644
index bf77a11c..00000000
Binary files a/plugins/calendar/skins/classic/images/listheader.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/loading_blue.gif b/plugins/calendar/skins/classic/images/loading_blue.gif
deleted file mode 100644
index 2ea6b19a..00000000
Binary files a/plugins/calendar/skins/classic/images/loading_blue.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/plus.png b/plugins/calendar/skins/classic/images/plus.png
deleted file mode 100644
index 1a35013e..00000000
Binary files a/plugins/calendar/skins/classic/images/plus.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/preview.png b/plugins/calendar/skins/classic/images/preview.png
deleted file mode 100644
index 75f43aa6..00000000
Binary files a/plugins/calendar/skins/classic/images/preview.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/print.png b/plugins/calendar/skins/classic/images/print.png
deleted file mode 100644
index 52dd67e8..00000000
Binary files a/plugins/calendar/skins/classic/images/print.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/spacer.gif b/plugins/calendar/skins/classic/images/spacer.gif
deleted file mode 100644
index c749aaf7..00000000
Binary files a/plugins/calendar/skins/classic/images/spacer.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/toggle.gif b/plugins/calendar/skins/classic/images/toggle.gif
deleted file mode 100644
index d3be86fc..00000000
Binary files a/plugins/calendar/skins/classic/images/toggle.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/toolbar.gif b/plugins/calendar/skins/classic/images/toolbar.gif
deleted file mode 100644
index 2cf2693c..00000000
Binary files a/plugins/calendar/skins/classic/images/toolbar.gif and /dev/null differ
diff --git a/plugins/calendar/skins/classic/images/toolbar.png b/plugins/calendar/skins/classic/images/toolbar.png
deleted file mode 100644
index d49162af..00000000
Binary files a/plugins/calendar/skins/classic/images/toolbar.png and /dev/null differ
diff --git a/plugins/calendar/skins/classic/print.css b/plugins/calendar/skins/classic/print.css
deleted file mode 100644
index 908d7600..00000000
--- a/plugins/calendar/skins/classic/print.css
+++ /dev/null
@@ -1,209 +0,0 @@
-/*** Printing styles for Calendar plugin ***/
-
-body {
-	margin: 0;
-	color: #000;
-	background: #fff;
-}
-
-body, td, th, div, p, h3, select, input, textarea {
-	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-	font-size: 8pt;
-}
-
-#calendar {
-	position: relative;
-	top: 0;
-	left: 0;
-	height: auto;
-	margin: 5em auto 0 auto;
-	overflow: visible;
-}
-
-#calendar .fc-header-right {
-	padding-right: 0;
-}
-
-#printconfig {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	z-index: 10000;
-	padding: 0.5em;
-	background: #ebebeb;
-	border-bottom: 1px solid #999;
-	box-shadow: 0 3px 4px #ccc;
-	-moz-box-shadow: 0 3px 4px #ccc;
-	-webkit-box-shadow: 0 3px 4px #ccc;
-}
-
-#printconfig .prop {
-	padding-right: 2em;
-}
-
-#message {
-	position: absolute;
-	top: 5.5em;
-	left: 1em;
-}
-
-#message div.loading {
-	color: #666;
-	font-style: italic;
-}
-
-#calendarlist {
-	list-style-type: square;
-	margin: 2em 0;
-	padding-left: 1em;
-}
-
-#calendarlist li {
-	float: left;
-	padding-left: 0;
-	padding-right: 3em;
-	margin-left: 0;
-	font-weight: bold;
-}
-
-#calendarlist input,
-#calendarlist .handle {
-	display: none;
-}
-
-.calwidth {
-	width: 700px;
-	margin: 0 auto;
-}
-
-.rightalign {
-	float: right;
-	padding-top: 0.3em;
-}
-
-@media print {
-	.noprint,
-	.fc-header-right span {
-		display: none;
-	}
-	
-	#calendar {
-		margin-top: 0;
-	}
-}
-
-/* fullcalendar style overrides */
-
-.fc-view {
-	overflow: visible;
-}
-
-.fc-event-skin,
-.fc-event-inner .fc-event-skin {
-	color: black;
-	background-color: #fff !important;
-}
-
-.fc-event-title {
-	font-weight: bold;
-}
-
-.fc-event-hori .fc-event-title {
-	font-weight: normal;
-	white-space: nowrap;
-}
-
-.fc-event-hori .fc-event-time {
-	white-space: nowrap;
-	font-weight: normal !important;
-	font-size: 10px;
-	padding-right: 0.6em;
-}
-
-.fc-grid .fc-event-time {
-	font-weight: normal !important;
-	padding-right: 0.3em;
-}
-
-.fc-event-cateories {
-	font-style: italic;
-}
-
-.fc-event-location {
-	font-size: 90%;
-}
-
-.fc-agenda-slots td div {
-	height: 1.4em;
-}
-
-.fc-widget-header,
-.fc-mon, .fc-tue, .fc-wed, .fc-thu, .fc-fri {
-	background-color: #fff;
-}
-
-.fc-widget-header, .fc-widget-content {
-	border-color: #ccc;
-}
-
-.fc-icon-alarms,
-.fc-icon-recurring {
-	display: inline-block;
-	width: 11px;
-	height: 11px;
-	background: url('images/eventicons.gif') 0 0 no-repeat;
-	margin-left: 3px;
-	line-height: 10px;
-}
-
-.fc-icon-alarms {
-	background-position: 0 -13px;
-}
-
-.fc-view-list, .fc-view-table {
-	border: 0;
-}
-
-.fc-view-list div.fc-list-header,
-.fc-view-table td.fc-list-header {
-	padding: 0.3em;
-	background: #fff;
-	font-weight: bold;
-	font-size: 1.2em;
-	color: #333;
-	border-color: #333;
-	border-style: solid;
-	border-width: 1px 0;
-	filter: none;
-}
-
-.fc-list-section .fc-event {
-	cursor: auto;
-}
-
-.fc-view-table tr.fc-event td,
-.fc-view-table tr.fc-event td.fc-event-handle {
-	border-color: #999;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.fc-view-table tr.fc-last td {
-	border: 0;
-}
-
-.fc-view-table tr.fc-event .fc-event-description {
-	padding-left: 2em;
-	padding-top: 0em;
-}
-
-.fc-event-vert .fc-event-description {
-	font-size: 90%;
-	font-style: italic;
-}
-
-
-.fc-view-table col.fc-event-location {
-	width: 20%;
-}
diff --git a/plugins/calendar/skins/classic/print.iehacks.css b/plugins/calendar/skins/classic/print.iehacks.css
deleted file mode 100644
index 986f0044..00000000
--- a/plugins/calendar/skins/classic/print.iehacks.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* CSS hacks for IE 6/7 */
-
-#calendar {
-	top: 5em;
-}
-
-.calwidth {
-	width: 172mm;
-}
-
-.fc-header-title h2 {
-	font-size: 16px;
-}
-
-#calendarlist li {
-	float: none;
-	padding: 0;
-	margin-left: 1em;
-}
-
-@media print {
-	#calendar {
-		top: 0;
-	}
-}
\ No newline at end of file
diff --git a/plugins/calendar/skins/classic/templates/attachment.html b/plugins/calendar/skins/classic/templates/attachment.html
deleted file mode 100644
index d060c0d7..00000000
--- a/plugins/calendar/skins/classic/templates/attachment.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="extwin">
-
-<roundcube:include file="/includes/header.html" />
-
-<div id="partheader">
-<roundcube:object name="plugin.attachmentcontrols" cellpadding="2" cellspacing="0" downloadlink="true" />
-
-<div style="position:absolute; top:2px; right:0; width:12em; text-align:right">
-  [<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>]
-</div>
-</div>
-
-
-<div id="attachmentcontainer">
-<roundcube:object name="plugin.attachmentframe" id="attachmentframe" width="100%" height="100%" />
-</div>
-
-</body>
-</html>
-
diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html
deleted file mode 100644
index b955c714..00000000
--- a/plugins/calendar/skins/classic/templates/calendar.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="plugins/calendar/skins/classic/iehacks.css" /><![endif]-->
-</head>
-<roundcube:if condition="env:extwin" /><body class="calendarmain extwin"><roundcube:else /><body class="calendarmain"><roundcube:endif />
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-
-<div id="main">
-  <div id="calendarsidebar">
-    <div id="calendartoolbar">
-      <roundcube:button command="addevent" type="link" class="buttonPas addevent" classAct="button addevent" classSel="button addeventSel" title="calendar.new_event" content=" " />
-      <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" title="calendar.print" content=" " />
-      <roundcube:button command="events-import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="calendar.importevents" content=" " />
-      <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="calendar.export" content=" " />
-      <roundcube:container name="toolbar" id="calendartoolbar" />
-    </div>
-
-    <div id="datepicker"></div>
-    <div id="calendars" style="visibility:hidden">
-      <div class="boxtitle"><roundcube:label name="calendar.calendars" /></div>
-      <div class="listsearchbox">
-        <div class="searchbox">
-          <input type="text" name="q" id="calendarlistsearch" placeholder="<roundcube:label name='calendar.findcalendars' />" />
-          <a class="iconbutton searchicon"></a>
-          <roundcube:button command="reset-listsearch" id="calendarlistsearch-reset" class="reset searchreset" title="resetsearch" content="x" />
-        </div>
-      </div>
-      <div class="boxlistcontent">
-      <roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist" />
-      </div>
-      <div class="boxfooter">
-        <roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="buttonPas addgroup" classAct="button addgroup" content=" " />
-        <roundcube:button name="calendaroptionslink" id="calendaroptionslink" type="link" title="moreactions" class="button groupactions" onclick="rcmail_ui.show_popup('calendaroptions');return false" content=" " />
-      </div>
-    </div>
-  </div>
-  <div id="calendarsidebartoggle"></div>
-  <div id="calendar">
-    <roundcube:object name="plugin.angenda_options" class="boxfooter" id="agendaoptions" />
-  </div>
-</div>
-
-<div id="calendaroptionsmenu" class="popupmenu">
-  <ul>
-    <li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
-    <li><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
-    <roundcube:if condition="env:calendar_driver == 'kolab'" />
-    <li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
-    <roundcube:endif />
-    <li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
-    <roundcube:if condition="env:calendar_driver == 'kolab'" />
-    <li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
-    <roundcube:endif />
-  </ul>
-</div>
-
-<div id="eventshow" class="uidialog">
-  <h1 id="event-title">Event Title</h1>
-  <div class="event-section" id="event-location">Location</div>
-  <div class="event-section" id="event-date">From-To</div>
-  <div class="event-section" id="event-description">
-    <h5 class="label"><roundcube:label name="calendar.description" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section" id="event-url">
-    <h5 class="label"><roundcube:label name="calendar.url" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section" id="event-repeat">
-    <h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section" id="event-alarm">
-    <h5 class="label"><roundcube:label name="calendar.alarms" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section event-attendees" id="event-attendees">
-    <h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-line" id="event-partstat">
-    <label><roundcube:label name="calendar.mystatus" /></label>
-    <a href="#change" class="changersvp" title="<roundcube:label name='calendar.changepartstat' />">
-      <span class="event-text"></span>
-    </a>
-  </div>
-  <div class="event-line" id="event-calendar">
-    <label><roundcube:label name="calendar.calendar" /></label>
-    <span class="event-text">Default</span>
-  </div>
-  <div class="event-line" id="event-category">
-    <label><roundcube:label name="calendar.category" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-line" id="event-free-busy">
-    <label><roundcube:label name="calendar.freebusy" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-line" id="event-priority">
-    <label><roundcube:label name="calendar.priority" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-line" id="event-sensitivity">
-    <label><roundcube:label name="calendar.sensitivity" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-section" id="event-attachments">
-    <label><roundcube:label name="attachments" /></label>
-    <div class="event-text attachments-list"></div>
-  </div>
-  
-  <roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" style="display:none" />
-</div>
-
-<div id="eventoptionsmenu" class="popupmenu">
-  <ul>
-    <li><roundcube:button command="event-download" label="download" classAct="active" /></li>
-    <li><roundcube:button command="event-sendbymail" label="send" classAct="active" /></li>
-  </ul>
-</div>
-
-<roundcube:include file="/templates/eventedit.html" />
-
-<div id="eventresourcesdialog" class="uidialog">
-  <div id="resource-dialog-left">
-    <div id="resource-selection" class="">
-      <div id="resourcequicksearch">
-        <roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
-        <roundcube:button command="reset-resource-search" id="resourcesearchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
-      </div>
-      <div class="boxlistcontent">
-        <roundcube:object name="plugin.resources_list" id="resources-list" class="treelist" />
-      </div>
-    </div>
-  </div>
-
-  <div id="resource-dialog-right">
-    <div id="resource-info">
-      <h2 class="boxtitle"><roundcube:label name="calendar.resourcedetails" /></h2>
-      <roundcube:object name="plugin.resource_info" id="resource-details" />
-    </div>
-
-    <div id="resource-availability">
-      <h2 class="boxtitle"><roundcube:label name="calendar.resourceavailability" /></h2>
-      <roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" />
-    </div>
-  </div>
-</div>
-
-<div id="eventfreebusy" class="uidialog">
-  <roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table" cellspacing="0" cellpadding="0" border="0" />
-  
-  <div class="schedule-options">
-    &nbsp;
-    <div class="schedule-buttons">
-      <button id="shedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button><button id="shedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
-    </div>
-  </div>
-  
-  <div style="float:left; width:28em">
-    <div class="form-section">
-      <label for="schedule-startdate"><roundcube:label name="calendar.start" /></label>
-      <input type="text" name="startdate" size="11" id="schedule-startdate" disabled="true" /> &nbsp;
-      <input type="text" name="starttime" size="6" id="schedule-starttime" disabled="true" />
-    </div>
-    <div class="form-section">
-      <label for="schedule-enddate"><roundcube:label name="calendar.end" /></label>
-      <input type="text" name="enddate" size="11" id="schedule-enddate" disabled="true" /> &nbsp;
-      <input type="text" name="endtime" size="6"  id="schedule-endtime" disabled="true" />
-    </div>
-  </div>
-  <div style="float:left">
-    <div class="schedule-find-buttons">
-      <button id="shedule-find-prev">&#9668; <roundcube:label name="calendar.prevslot" /></button>
-      <button id="shedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
-    </div>
-    <div class="schedule-options">
-      <label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" /><roundcube:label name="calendar.onlyworkinghours" /></label>
-    </div>
-  </div>
-  <br style="clear:both;" />
-  
-  <roundcube:include file="/templates/freebusylegend.html" />
-  <div class="attendees-list">
-    <span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
-    <span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
-    <span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
-    <span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
-    <span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
-  </div>
-</div>
-
-<div id="calendarform" class="uidialog">
-  <roundcube:label name="loading" />
-</div>
-
-<div id="eventsimport" class="uidialog">
-  <roundcube:object name="plugin.events_import_form" id="events-import-form" uploadFieldSize="30" />
-</div>
-
-<div id="eventsexport" class="uidialog">
-  <roundcube:object name="plugin.events_export_form" id="events-export-form" />
-</div>
-
-<div id="calendarurlbox" class="uidialog">
-  <p><roundcube:label name="calendar.showurldescription" /></p>
-  <textarea id="calfeedurl" rows="2" readonly="readonly"></textarea>
-  <div id="calendarcaldavurl" style="display:none">
-    <p><roundcube:label name="calendar.caldavurldescription" html="yes" /></p>
-    <textarea id="caldavurl" rows="2" readonly="readonly"></textarea>
-  </div>
-</div>
-
-<div id="quicksearchbar">
-<roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass.png" />
-<roundcube:object name="plugin.searchform" id="quicksearchbox" />
-<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
-</div>
-
-<roundcube:object name="plugin.calendar_css" />
-
-<script type="text/javascript">
-
-// use skin functions to handle popup-menus
-rcube_init_mail_ui();
-rcmail_ui.popups.calendaroptions = { id:'calendaroptionsmenu', above:1, obj:$('#calendaroptionsmenu') };
-
-$(document).ready(function(e){
-  // initialize sidebar toggle
-  $('#calendarsidebartoggle').click(function() {
-    var width = $(this).data('sidebarwidth');
-    var offset = $(this).data('offset');
-    var $sidebar = $('#calendarsidebar'), time = 250;
-    
-    if ($sidebar.is(':visible')) {
-      $sidebar.animate({ left:'-'+(width+10)+'px' }, time, function(){ $('#calendarsidebar').hide(); });
-      $(this).animate({ left:'8px'}, time, function(){ $('#calendarsidebartoggle').addClass('sidebarclosed') });
-      $('#calendar').animate({ left:'20px'}, time, function(){ $(this).fullCalendar('render'); });
-    }
-    else {
-      $sidebar.show().animate({ left:'10px' }, time);
-      $(this).animate({ left:offset+'px'}, time, function(){ $('#calendarsidebartoggle').removeClass('sidebarclosed'); });
-      $('#calendar').animate({ left:(width+16)+'px'}, time, function(){ $(this).fullCalendar('render'); });
-    }
-  })
-  .data('offset', $('#calendarsidebartoggle').position().left)
-  .data('sidebarwidth', $('#calendarsidebar').width() + $('#calendarsidebar').position().left);
-});
-
-</script>
-
-</body>
-</html>
diff --git a/plugins/calendar/skins/classic/templates/eventedit.html b/plugins/calendar/skins/classic/templates/eventedit.html
deleted file mode 100644
index 7678d0cf..00000000
--- a/plugins/calendar/skins/classic/templates/eventedit.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<div id="eventedit" class="uidialog">
-  <form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
-    <ul>
-      <li><a href="#event-panel-1"><roundcube:label name="calendar.tabsummary" /></a></li>
-      <li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li>
-      <li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li>
-      <li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li>
-      <li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
-    </ul>
-    <!-- basic info -->
-    <div id="event-panel-1">
-      <div class="event-section">
-        <label for="edit-title"><roundcube:label name="calendar.title" /></label>
-        <br />
-        <input type="text" class="text" name="title" id="edit-title" size="40" />
-      </div>
-      <div class="event-section">
-        <label for="edit-location"><roundcube:label name="calendar.location" /></label>
-        <br />
-        <input type="text" class="text" name="location" id="edit-location" size="40" />
-      </div>
-      <div class="event-section">
-        <label for="edit-description"><roundcube:label name="calendar.description" /></label>
-        <br />
-        <textarea name="description" id="edit-description" class="text" rows="5" cols="40"></textarea>
-      </div>
-      <div class="event-section">
-        <label for="edit-url"><roundcube:label name="calendar.url" /></label>
-        <br />
-        <input type="text" class="text" name="vurl" id="edit-url" size="40" />
-      </div>
-      <div class="event-section">
-        <label style="float:right;padding-right:0.5em"><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
-        <label for="edit-startdate"><roundcube:label name="calendar.start" /></label>
-        <input type="text" name="startdate" size="11" id="edit-startdate" /> &nbsp;
-        <input type="text" name="starttime" size="6" id="edit-starttime" />
-      </div>
-      <div class="event-section">
-        <label for="edit-enddate"><roundcube:label name="calendar.end" /></label>
-        <input type="text" name="enddate" size="11" id="edit-enddate" /> &nbsp;
-        <input type="text" name="endtime" size="6"  id="edit-endtime" />
-      </div>
-      <div class="event-section" id="edit-alarms">
-        <div class="edit-alarm-item first">
-          <label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
-          <roundcube:object name="plugin.alarm_select" />
-          <span class="edit-alarm-buttons">
-            <a href="#add" class="iconlink add add-alarm">+</a>
-            <a href="#delete" class="iconlink delete delete-alarm">-</a>
-          </span>
-        </div>
-      </div>
-      <div class="event-section" id="calendar-select">
-        <label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
-        <roundcube:object name="plugin.calendar_select" id="edit-calendar" />
-      </div>
-      <div class="event-section">
-        <label for="edit-categories"><roundcube:label name="calendar.category" /></label>
-        <roundcube:object name="plugin.category_select" id="edit-categories" />
-      </div>
-      <div class="event-section">
-        <label for="edit-event-status"><roundcube:label name="calendar.status" /></label>
-        <roundcube:object name="plugin.status_select" id="edit-event-status" />
-      </div>
-      <div class="event-section">
-        <label for="edit-free-busy"><roundcube:label name="calendar.freebusy" /></label>
-        <roundcube:object name="plugin.freebusy_select" id="edit-free-busy" />
-      </div>
-      <div class="event-section">
-        <label for="edit-priority"><roundcube:label name="calendar.priority" /></label>
-        <roundcube:object name="plugin.priority_select" id="edit-priority" />
-      </div>
-      <div class="event-section">
-        <label for="edit-sensitivity"><roundcube:label name="calendar.sensitivity" /></label>
-        <roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" />
-      </div>
-    </div>
-    <!-- recurrence settings -->
-    <div id="event-panel-recurrence">
-      <div class="event-section border-after">
-        <roundcube:object name="plugin.recurrence_form" part="frequency" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-daily">
-        <roundcube:object name="plugin.recurrence_form" part="daily" class="event-section" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-weekly">
-        <roundcube:object name="plugin.recurrence_form" part="weekly" class="event-section" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-monthly">
-        <roundcube:object name="plugin.recurrence_form" part="monthly" class="event-section" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-yearly">
-        <roundcube:object name="plugin.recurrence_form" part="yearly" class="event-section" />
-      </div>
-      <div class="recurrence-form" id="recurrence-form-until">
-        <roundcube:object name="plugin.recurrence_form" part="until" class="event-section" />
-      </div>
-      <div class="recurrence-form" id="recurrence-form-rdate">
-        <roundcube:object name="plugin.recurrence_form" part="rdate" class="event-section" />
-      </div>
-    </div>
-    <!-- attendees list -->
-    <div id="event-panel-attendees">
-      <roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" />
-      <roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
-      <roundcube:include file="/templates/freebusylegend.html" />
-    </div>
-    <!-- resources list -->
-    <div id="event-panel-resources">
-      <roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" coltitle="resource" />
-      <roundcube:object name="plugin.resources_form" id="edit-resources-form" />
-      <roundcube:include file="/templates/freebusylegend.html" />
-    </div>
-    <!-- attachments list (with upload form) -->
-    <div id="event-panel-attachments">
-      <div id="edit-attachments" class="attachments-list">
-        <roundcube:object name="plugin.attachments_list" id="attachmentlist" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
-      </div>
-      <div id="edit-attachments-form">
-        <roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
-      </div>
-    </div>
-  </form>
-
-  <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" />
-  <roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" />
-  <div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
-</div>
\ No newline at end of file
diff --git a/plugins/calendar/skins/classic/templates/freebusylegend.html b/plugins/calendar/skins/classic/templates/freebusylegend.html
deleted file mode 100644
index 2f615000..00000000
--- a/plugins/calendar/skins/classic/templates/freebusylegend.html
+++ /dev/null
@@ -1,7 +0,0 @@
-  <div id="edit-attendees-legend" class="availability">
-    <span class="legend"><img class="availabilityicon free" src="program/resources/blank.gif" /> <roundcube:label name="calendar.availfree" /></span>
-    <span class="legend"><img class="availabilityicon busy" src="program/resources/blank.gif" /> <roundcube:label name="calendar.availbusy" /></span>
-    <span class="legend"><img class="availabilityicon tentative" src="program/resources/blank.gif" /> <roundcube:label name="calendar.availtentative" /></span>
-    <!--<span class="legend"><img class="availabilityicon out-of-office" src="program/resources/blank.gif" /> <roundcube:label name="calendar.availoutofoffice" /></span>-->
-    <span class="legend"><img class="availabilityicon unknown" src="program/resources/blank.gif" /> <roundcube:label name="calendar.availunknown" /></span>
-  </div>
diff --git a/plugins/calendar/skins/classic/templates/itipattend.html b/plugins/calendar/skins/classic/templates/itipattend.html
deleted file mode 100644
index f4290d82..00000000
--- a/plugins/calendar/skins/classic/templates/itipattend.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="calendaritipattend">
-
-<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" style="margin:0 11px" />
-
-<roundcube:object name="message" id="message" />
-
-<div class="centerbox">
-	<roundcube:object name="plugin.event_inviteform" />
-	<roundcube:object name="plugin.event_invitebox" class="calendar-invitebox" />
-	<roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" delegate="false" />
-	</form>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/calendar/skins/classic/templates/kolabacl.html b/plugins/calendar/skins/classic/templates/kolabacl.html
deleted file mode 100644
index 668a6704..00000000
--- a/plugins/calendar/skins/classic/templates/kolabacl.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-</head>
-<body class="iframe" style="background:#fff; margin:0">
-
-<roundcube:object name="folderacl" />
-
-</body>
-</html>
diff --git a/plugins/calendar/skins/classic/templates/kolabform.html b/plugins/calendar/skins/classic/templates/kolabform.html
deleted file mode 100644
index a74481a1..00000000
--- a/plugins/calendar/skins/classic/templates/kolabform.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="calendar-kolabform">
-  <roundcube:object name="calendarform" />
-</div>
-<script type="text/javascript">rcube_init_tabs('calendar-kolabform');</script>
-<style type="text/css">
-#calendarpropform { min-width:680px }
-</style>
\ No newline at end of file
diff --git a/plugins/calendar/skins/classic/templates/print.html b/plugins/calendar/skins/classic/templates/print.html
deleted file mode 100644
index ead7ff5c..00000000
--- a/plugins/calendar/skins/classic/templates/print.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-</head>
-<body class="calendarprint">
-
-<div id="printconfig" class="noprint">
-  <div class="calwidth">
-    <a href="#close" onclick="window.close()" class="rightalign"><roundcube:label name="close" /></a>
-    <span class="prop"><input type="button" id="printme" value="<roundcube:label name='print' />" onclick="window.print()"></span>
-    <span class="prop"><label><input type="checkbox" id="propdescription" checked="checked" /> <roundcube:label name="calendar.printdescriptions" /></label></span>
-  </div>
-</div>
-
-<roundcube:object name="message" id="message" class="noprint" />
-
-<div id="calendar" class="calwidth"></div>
-
-<div class="calwidth">
-  <roundcube:object name="plugin.calendar_list" activeonly="true" id="calendarlist" />
-</div>
-
-<roundcube:object name="plugin.calendar_css" printmode="true" />
-
-<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="plugins/calendar/skins/classic/print.iehacks.css" /><![endif]-->
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
new file mode 100644
index 00000000..bfea051c
--- /dev/null
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -0,0 +1,384 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="calendar.calendar" /></h1>
+
+<!-- calendars list -->
+<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-calendars">
+	<div class="header">
+		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span id="aria-label-calendars" class="header-title"><roundcube:label name="calendar.calendars" /></span>
+		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
+			title="calendar.calendaractions" class="button icon sidebar-menu" data-popup="calendaractions-menu"
+			innerClass="inner" label="actions" />
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar toolbar"
+		ariatag="h2" label="calsearchform" label-domain="calendar" buttontitle="findcalendars" />
+	<div id="calendars-content" class="scroller">
+		<roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing iconized" />
+	</div>
+	<h2 id="aria-label-minical" class="voice"><roundcube:label name="calendar.arialabelminical" /></h2>
+	<div id="datepicker" class="calendar-datepicker" role="presentation"></div>
+</div>
+
+<!-- calendar -->
+<div class="content selected no-navbar" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="calendar.calendars" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div id="calendartoolbar" class="toolbar">
+			<roundcube:button command="addevent" type="link"
+				class="button create disabled" classAct="button create"
+				label="create" title="calendar.new_event" innerClass="inner" />
+			<roundcube:button command="print" type="link" data-hidden="small"
+				class="button print disabled" classAct="button print"
+				label="calendar.print" title="calendar.printtitle" innerClass="inner" />
+			<span class="spacer"></span>
+			<roundcube:button command="events-import" type="link"
+				class="button import disabled" classAct="button import"
+				label="import" title="calendar.importevents" innerClass="inner" />
+			<roundcube:button command="export" type="link"
+				class="button export disabled" classAct="button export"
+				label="calendar.export" title="calendar.exporttitle" innerClass="inner" />
+			<roundcube:container name="toolbar" id="calendartoolbar" />
+		</div>
+	</div>
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+		label="searchform" buttontitle="calendar.findevents" label-domain="calendar" ariatag="h2" />
+	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
+	<div id="calendar" class="content" role="main" aria-labelledby="aria-label-calendarview" data-elastic-mode="true">
+		<roundcube:object name="plugin.agenda_options" id="agendaoptions" />
+		<div id="searchcontrols" class="search-controls"></div>
+	</div>
+	<div class="footer toolbar content-frame-navigation" role="toolbar" data-hidden="big">
+		<a href="#" class="button prev" onclick="$('.fc-button-prev').click()"><span class="inner"><roundcube:label name="previous" /></span></a>
+		<a href="#" class="button today" onclick="$('.fc-button-today').click()"><span class="inner"><roundcube:label name="today" /></span></a>
+		<a href="#" class="button date" onclick="window.calendar_datepicker()"><span class="inner"><roundcube:label name="date" /></span></a>
+		<a href="#" class="button next" onclick="$('.fc-button-next').click()"><span class="inner"><roundcube:label name="next" /></span></a>
+	</div>
+</div>
+
+<div id="timezone-display" class="hidden"><roundcube:var name="env:timezone" /></div>
+
+<div id="eventshow" class="popupmenu formcontent propform text-only">
+	<h1 id="event-title" class="event-title form-group">Event Title</h1>
+	<div id="event-status-badge"><span></span></div>
+	<div class="event-location form-group" id="event-location">Location</div>
+	<div class="event-date form-group" id="event-date">From-To</div>
+	<div class="event-description form-group" id="event-description">
+		<div class="event-text"></div>
+	</div>
+	<div class="event-attendees form-group" id="event-attendees">
+		<div class="event-text"></div>
+	</div>
+	<div id="event-url" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.url" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-repeat" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.repeat" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-alarm" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.alarms" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-partstat" class="form-group row event-partstat">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.mystatus" /></label>
+		<span class="col-sm-8 form-control-plaintext">
+			<span class="event-text rsvp-status"></span>
+			<a class="changersvp button edit" href="#" title="<roundcube:label name='calendar.changepartstat' />"><span class="inner"><roundcube:label name='calendar.changepartstat' /></span></a>
+		</span>
+	</div>
+	<div id="event-calendar" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.calendar" /></label>
+		<span class="col-sm-8 form-control-plaintext event-text">Default</span>
+	</div>
+	<div id="event-category" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.category" /></label>
+		<span class="col-sm-8 form-control-plaintext event-text"></span>
+	</div>
+	<div id="event-status" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.status" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-free-busy" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-priority" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.priority" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-rsvp-comment" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.rsvpcomment" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-links" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.links" /></label>
+		<span class="event-text col-sm-8"></span>
+	</div>
+	<div id="event-attachments" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
+		<span class="event-text col-sm-8"></span>
+	</div>
+	<div id="event-created" class="form-group row faded">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.created" /></label>
+		<span class="event-text event-created col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-changed" class="form-group row faded">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.changed" /></label>
+		<span class="event-text event-changed col-sm-8 form-control-plaintext"></span>
+	</div>
+	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="calendar-invitebox invitebox boxinformation" style="display:none" />
+</div>
+
+<roundcube:include file="/templates/eventedit.html" />
+
+<div id="calendaractions-menu" class="popupmenu">
+	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-calendaroptions">
+		<roundcube:button type="link-menuitem" command="calendar-create" label="calendar.addcalendar" class="create disabled" classAct="create active" />
+		<roundcube:button type="link-menuitem" command="calendar-edit" label="calendar.edit" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="calendar-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:if condition="env:calendar_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="calendar-remove" label="calendar.removelist" class="remove disabled" classAct="remove active" />
+		<roundcube:endif />
+		<roundcube:button type="link-menuitem" command="calendar-showurl" label="calendar.showurl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:if condition="!empty(env:calendar_settings['freebusy_url'])" />
+			<roundcube:button type="link-menuitem" command="calendar-showfburl" label="calendar.showfburl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:endif />
+		<roundcube:if condition="env:calendar_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<div id="eventoptionsmenu" class="popupmenu">
+	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-eventoptions">
+		<roundcube:button type="link-menuitem" command="event-download" label="download" class="download disabled" classAct="download active" />
+		<roundcube:button type="link-menuitem" command="event-sendbymail" label="send" class="send disabled" classAct="send active" />
+		<roundcube:button type="link-menuitem" command="event-copy" label="copy" class="copy disabled" classAct="copy active" />
+		<roundcube:if condition="env:calendar_driver == 'kolab' && config:kolab_bonnie_api" />
+			<roundcube:button type="link-menuitem" command="event-history" label="calendar.eventhistory" class="history disabled" classAct="history active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<div id="eventresourcesdialog" class="popupmenu">
+	<h3 class="voice" id="aria-label-resourceselection"><roundcube:label name="calendar.arialabelresourceselection" /></h3>
+	<div class="resource-selection selection-list" role="navigation" aria-labelledby="aria-label-resourceselection">
+		<div class="header">
+			<span class="header-title"><roundcube:label name="calendar.tabresources" /></span>
+		</div>
+		<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
+			wrapper="searchbar toolbar" ariatag="h4" buttontitle="calendar.findresources"
+			label="resourcesearchform" label-domain="calendar" />
+		<div class="scroller">
+			<roundcube:object name="plugin.resources_list" id="resources-list" class="listing treelist" />
+		</div>
+	</div>
+	<div class="resource-content selection-content">
+		<div class="header" data-hidden="normal,big">
+			<a class="button icon back" href="#back" onclick="$('#eventresourcesdialog .resource-content').hide(); $('#eventresourcesdialog .resource-selection').show()">
+				<span class="inner"><roundcube:label name="back" /></span>
+			</a>
+			<span class="header-title"><roundcube:label name="calendar.resourceprops" /></span>
+		</div>
+		<ul class="nav nav-tabs" role="tablist">
+			<li class="nav-item">
+				<a class="nav-link active" href="#resource-availability" data-toggle="tab" role="tab">
+					<roundcube:label name="calendar.resourceavailability" />
+				</a>
+			</li>
+			<li class="nav-item">
+				<a class="nav-link" href="#resource-info" data-toggle="tab" role="tab">
+					<roundcube:label name="calendar.resourcedetails" />
+				</a>
+			</li>
+		</ul>
+		<div class="tab-content">
+			<div id="resource-availability" class="tab-pane active" role="tabpanel" aria-labelledby="aria-label-resourceavailability">
+				<h3 class="voice" id="aria-label-resourceavailability"><roundcube:label name="calendar.resourceavailability" /></h3>
+				<roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" class="raw-tables" />
+				<div class="slot-nav">
+					<roundcube:button name="resource-cal-prev" id="resource-calendar-prev" type="link"
+						class="icon prevpage" title="calendar.prevslot" label="calendar.prevweek" />
+					<roundcube:button name="resource-cal-next" id="resource-calendar-next" type="link"
+						class="icon nextpage" title="calendar.nextslot" label="calendar.nextweek" />
+				</div>
+			</div>
+			<div id="resource-info" class="tab-pane" role="tabpanel" aria-labelledby="aria-label-resourcedetails">
+				<h3 class="voice" id="aria-label-resourcedetails"><roundcube:label name="calendar.resourcedetails" /></h3>
+				<roundcube:object name="plugin.resource_info" id="resource-details" class="propform text-only"
+					aria-live="polite" aria-relevant="text" aria-atomic="true" />
+			</div>
+		</div>
+	</div>
+</div>
+
+<div id="eventfreebusy" class="popupmenu calendar-scheduler formcontent">
+	<roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table"
+		class="schedule-table" data-h-margin="-1" data-v-margin="1" />
+	<div class="nav">
+		<div class="schedule-buttons">
+			<button type="button" id="schedule-find-prev" class="btn btn-secondary prev-slot"><roundcube:label name="calendar.prevslot" /></button>
+			<button type="button" id="schedule-find-next" class="btn btn-secondary next-slot"><roundcube:label name="calendar.nextslot" /></button>
+		</div>
+		<div class="schedule-options">
+			<label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" class="pretty-checkbox" /><roundcube:label name="calendar.onlyworkinghours" /></label>
+		</div>
+		<div class="schedule-nav">
+			<button type="button" id="schedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button>
+			<button type="button" id="schedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
+		</div>
+	</div>
+	<div class="schedule-range">
+		<div class="form-group row">
+			<label for="schedule-startdate" class="col-form-label col-sm-2"><roundcube:label name="calendar.start" /></label>
+			<span class="col-sm-10 datetime">
+				<input type="text" name="startdate" size="11" id="schedule-startdate" class="form-control" disabled="true" /> &nbsp;
+				<input type="text" name="starttime" size="6" id="schedule-starttime" class="form-control" disabled="true" />
+			</span>
+		</div>
+		<div class="form-group row">
+			<label for="schedule-enddate" class="col-form-label col-sm-2"><roundcube:label name="calendar.end" /></label>
+			<span class="col-sm-10 datetime">
+				<input type="text" name="enddate" size="11" id="schedule-enddate" class="form-control" disabled="true" /> &nbsp;
+				<input type="text" name="endtime" size="6" id="schedule-endtime" class="form-control" disabled="true" />
+			</span>
+		</div>
+		<div class="schedule-legend form-group row">
+			<label class="col-form-label col-sm-2"><roundcube:label name="calendar.legend" /></label>
+			<span class="col-sm-10 form-control-plaintext">
+				<roundcube:include file="/templates/freebusylegend.html" />
+				<span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
+				<span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
+				<span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
+				<span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
+				<span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
+			</span>
+		</div>
+	</div>
+</div>
+
+<div id="eventsimport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.events_import_form" id="events-import-form" />
+</div>
+
+<div id="eventsexport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.events_export_form" id="events-export-form" />
+</div>
+
+<div id="calendarurlbox" class="popupmenu">
+	<p><roundcube:label name="calendar.showurldescription" /></p>
+	<textarea id="calfeedurl" rows="2" readonly="readonly"></textarea>
+	<div id="calendarcaldavurl" style="display:none; margin-top:1rem">
+		<p><roundcube:label name="calendar.caldavurldescription" html="yes" /></p>
+		<textarea id="caldavurl" rows="2" readonly="readonly"></textarea>
+	</div>
+</div>
+
+<div id="fburlbox" class="popupmenu">
+	<p><roundcube:label name="calendar.fburldescription" /></p>
+	<textarea id="fburl" rows="2" readonly="readonly"></textarea>
+</div>
+
+<roundcube:if condition="config:kolab_bonnie_api" />
+
+<div id="eventhistory" class="popupmenu" aria-hidden="true">
+	<roundcube:object name="plugin.object_changelog_table" id="event-changelog-table" class="changelog-table" />
+	<div class="compare-button"><input type="button" class="button" value="<roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="eventdiff" class="popupmenu formcontent text-only">
+	<h1 class="event-title">Event Title</h1>
+	<h1 class="event-title-new event-text-new"></h1>
+	<div class="form-group row event-date"></div>
+	<div class="form-group row event-location">
+		<h5 class="label"><roundcube:label name="calendar.location" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-description">
+		<h5 class="label"><roundcube:label name="calendar.description" /></h5>
+		<div class="event-text-diff" style="white-space:pre-wrap"></div>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-url">
+		<h5 class="label"><roundcube:label name="calendar.url" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-recurrence">
+		<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-alarms">
+		<h5 class="label"><roundcube:label name="calendar.alarms" /><span class="index"></span></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-line event-start">
+		<label><roundcube:label name="calendar.start" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-end">
+		<label><roundcube:label name="calendar.end" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-attendees">
+		<label><roundcube:label name="calendar.tabattendees" /><span class="index"></span></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-calendar">
+		<label><roundcube:label name="calendar.calendar" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-categories">
+		<label><roundcube:label name="calendar.category" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-status">
+		<label><roundcube:label name="calendar.status" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-free_busy">
+		<label><roundcube:label name="calendar.freebusy" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-priority">
+		<label><roundcube:label name="calendar.priority" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-sensitivity">
+		<label><roundcube:label name="calendar.sensitivity" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="form-group row event-attachments">
+		<label><roundcube:label name="attachments" /><span class="index"></span></label>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+</div>
+
+<roundcube:endif />
+
+<roundcube:object name="plugin.calendar_css" folder-class="div.$class a.calname:before" folder-fallback-color="#161b1d" />
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/calendar/skins/elastic/templates/dialog.html b/plugins/calendar/skins/elastic/templates/dialog.html
new file mode 100644
index 00000000..28dcf79d
--- /dev/null
+++ b/plugins/calendar/skins/elastic/templates/dialog.html
@@ -0,0 +1,7 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="calendar.arialabeleventform" /></h1>
+
+<roundcube:include file="/templates/eventedit.html" />
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/calendar/skins/elastic/templates/eventedit.html b/plugins/calendar/skins/elastic/templates/eventedit.html
new file mode 100644
index 00000000..d0c97e16
--- /dev/null
+++ b/plugins/calendar/skins/elastic/templates/eventedit.html
@@ -0,0 +1,158 @@
+<div id="eventedit" class="<roundcube:exp expression="env:framed ? '' : 'popupmenu '">formcontent" aria-hidden="true" data-notabs="true">
+	<form class="tabbed" action="#" method="post" enctype="multipart/form-data">
+		<!-- basic info -->
+		<fieldset id="event-panel-summary">
+			<legend><roundcube:label name="calendar.tabsummary" /></legend>
+			<div class="form-group">
+				<label for="edit-title"><roundcube:label name="calendar.title" /></label>
+				<input type="text" class="form-control" name="title" id="edit-title" size="40" required="true" />
+			</div>
+			<div class="form-group">
+				<label for="edit-location"><roundcube:label name="calendar.location" /></label>
+				<input type="text" class="form-control" name="location" id="edit-location" size="40" />
+			</div>
+			<div class="form-group">
+				<label for="edit-description"><roundcube:label name="calendar.description" /></label>
+				<textarea name="description" id="edit-description" class="form-control" rows="5" cols="40"></textarea>
+			</div>
+			<div class="form-group row">
+				<label for="edit-startdate" class="col-sm-2 col-form-label"><roundcube:label name="calendar.start" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="startdate" size="11" id="edit-startdate" class="form-control" required="true" /> &nbsp;
+					<input type="text" name="starttime" size="6" id="edit-starttime" class="form-control" aria-label="<roundcube:label name='calendar.starttime' />" />
+					<label><input type="checkbox" name="allday" id="edit-allday" value="1" class="pretty-checkbox" /><roundcube:label name="calendar.all-day" /></label>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-enddate" class="col-sm-2 col-form-label"><roundcube:label name="calendar.end" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="enddate" size="11" id="edit-enddate" class="form-control" required="true" /> &nbsp;
+					<input type="text" name="endtime" size="6" id="edit-endtime" class="form-control" aria-label="<roundcube:label name='calendar.endtime' />" />
+				</div>
+			</div>
+			<div class="form-group row" id="edit-alarms">
+				<label for="edit-alarm-item" class="col-sm-2 col-form-label"><roundcube:label name="calendar.alarms" /></label>
+				<div class="col-sm-10 alarms-input">
+					<div class="edit-alarm-item first">
+						<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
+						<span class="edit-alarm-buttons">
+							<a href="#add" class="icon button btn create add-alarm"><span class="inner"><roundcube:label name="libcalendaring.addalarm" /></span></a>
+							<a href="#delete" class="icon button btn delete delete-alarm"><span class="inner"><roundcube:label name="libcalendaring.removealarm" /></span></a>
+						</span>
+					</div>
+				</div>
+			</div>
+			<div class="form-group row" id="calendar-select">
+				<label for="edit-calendar" class="col-sm-2 col-form-label"><roundcube:label name="calendar.calendar" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.calendar_select" id="edit-calendar" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-categories" class="col-sm-2 col-form-label"><roundcube:label name="calendar.category" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.category_select" id="edit-categories" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-event-status" class="col-sm-2 col-form-label"><roundcube:label name="calendar.status" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.status_select" id="edit-event-status" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-free-busy" class="col-sm-2 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.freebusy_select" id="edit-free-busy" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-priority" class="col-sm-2 col-form-label"><roundcube:label name="calendar.priority" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.priority_select" id="edit-priority" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-sensitivity" class="col-sm-2 col-form-label"><roundcube:label name="calendar.sensitivity" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-url" class="col-sm-2 col-form-label"><roundcube:label name="calendar.url" /></label>
+				<div class="col-sm-10">
+					<input type="text" class="form-control" name="vurl" id="edit-url" size="40" />
+				</div>
+			</div>
+			<div class="form-group row" id="edit-event-links">
+				<label class="col-sm-2 col-form-label"><roundcube:label name="calendar.links" /></label>
+				<div class="col-sm-10">
+					<div class="event-text"></div>
+				</div>
+			</div>
+		</fieldset>
+		<!-- recurrence settings -->
+		<fieldset id="event-panel-recurrence">
+			<legend><roundcube:label name="calendar.tabrecurrence" /></legend>
+			<div class="form-group row border-after">
+				<roundcube:object name="plugin.recurrence_form" part="frequency" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-daily">
+				<roundcube:object name="plugin.recurrence_form" part="daily" class="form-group row" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-weekly">
+				<roundcube:object name="plugin.recurrence_form" part="weekly" class="form-group row" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-monthly">
+				<roundcube:object name="plugin.recurrence_form" part="monthly" class="form-group row" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-yearly">
+				<roundcube:object name="plugin.recurrence_form" part="yearly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-until">
+				<roundcube:object name="plugin.recurrence_form" part="until" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-rdate">
+				<roundcube:object name="plugin.recurrence_form" part="rdate" class="form-group row" />
+			</div>
+		</fieldset>
+		<!-- attendees list -->
+		<fieldset id="event-panel-attendees" data-navlink-class="nav-icon attendees">
+			<legend><roundcube:label name="calendar.tabattendees" /></legend>
+			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="calendar.arialabeleventattendees" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table no-img table table-sm"
+				coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
+			<roundcube:include file="/templates/freebusylegend.html" />
+		</fieldset>
+		<!-- resources list -->
+		<fieldset id="event-panel-resources" data-navlink-class="nav-icon resources">
+			<legend><roundcube:label name="calendar.tabresources" /></legend>
+			<h3 id="aria-label-resourcestable" class="voice"><roundcube:label name="calendar.arialabeleventresources" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="edit-attendees-table no-img table table-sm"
+				coltitle="resource" aria-labelledby="aria-label-resourcestable" />
+			<roundcube:object name="plugin.resources_form" id="edit-resources-form" />
+			<roundcube:include file="/templates/freebusylegend.html" />
+		</fieldset>
+		<!-- attachments list (with upload form) -->
+		<fieldset id="event-panel-attachments" data-navlink-class="nav-icon attachments">
+			<legend><roundcube:label name="calendar.tabattachments" /></legend>
+			<div id="edit-attachments-droparea" class="file-upload">
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
+				<div id="edit-attachments-form" class="upload-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+					<roundcube:object name="plugin.attachments_form" mode="hint" />
+					<button type="button" class="btn btn-secondary attach" onclick="rcmail.upload_input('event-attachment-form'); return false"><roundcube:label name="addattachment" /></button>
+				</div>
+				<div id="edit-attachments">
+					<roundcube:object name="plugin.attachments_list" id="attachmentlist" class="attachmentslist" />
+				</div>
+			</div>
+			<roundcube:object name="plugin.filedroparea" id="edit-attachments-droparea" />
+		</fieldset>
+	</form>
+	<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_recurring_warning" class="dialog-message edit-recurring-warning" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="event-attachment-form" mode="smart" />
+	<div id="edit-localchanges-warning" class="dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
+</div>
diff --git a/plugins/calendar/skins/elastic/templates/freebusylegend.html b/plugins/calendar/skins/elastic/templates/freebusylegend.html
new file mode 100644
index 00000000..356e9390
--- /dev/null
+++ b/plugins/calendar/skins/elastic/templates/freebusylegend.html
@@ -0,0 +1,9 @@
+<div id="edit-attendees-legend" class="availability">
+	<span class="legend free"><roundcube:label name="calendar.availfree" /></span>
+	<span class="legend busy"><roundcube:label name="calendar.availbusy" /></span>
+	<span class="legend tentative"><roundcube:label name="calendar.availtentative" /></span>
+	<!--
+	<span class="legend out-of-office"><roundcube:label name="calendar.availoutofoffice" /></span>
+	-->
+	<span class="legend unknown"><roundcube:label name="calendar.availunknown" /></span>
+</div>
diff --git a/plugins/calendar/skins/elastic/templates/itipattend.html b/plugins/calendar/skins/elastic/templates/itipattend.html
new file mode 100644
index 00000000..0dd4dfb6
--- /dev/null
+++ b/plugins/calendar/skins/elastic/templates/itipattend.html
@@ -0,0 +1,11 @@
+<roundcube:include file="includes/layout.html" />
+
+<roundcube:object name="plugin.event_inviteform" class="standalone-invitebox" />
+	<roundcube:object name="logo" src="/images/logo.svg" data-src-small="0" id="logo" alt="Logo" />
+	<div class="calendar-invitebox invitebox boxinformation">
+		<roundcube:object name="plugin.event_invitebox" />
+		<roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" delegate="false" />
+	</div>
+</form>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/calendar/skins/elastic/templates/print.html b/plugins/calendar/skins/elastic/templates/print.html
new file mode 100644
index 00000000..b560dad4
--- /dev/null
+++ b/plugins/calendar/skins/elastic/templates/print.html
@@ -0,0 +1,19 @@
+<roundcube:include file="includes/layout.html" />
+
+<div class="print-config">
+	<button type="button" class="btn btn-primary print" onclick="window.print()"><roundcube:label name='print' /></button>
+	<span class="prop">
+		<input type="checkbox" id="propdescription" checked="checked" class="pretty-checkbox" />
+		<label for="propdescription"><roundcube:label name="calendar.printdescriptions" /></label>
+	</span>
+	<div id="calendar-view-selector" class="btn-group btn-group-toggle" role="group"></div>
+</div>
+
+<div class="print-content">
+	<div id="calendar" data-view-selector="calendar-view-selector"></div>
+</div>
+
+<roundcube:object name="plugin.calendar_list" activeonly="true" id="calendarlist" class="hidden" />
+<roundcube:object name="plugin.calendar_css" printmode="true" />
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 50c5910b..3a88258f 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -69,31 +69,18 @@ body.calendarmain #mainscreen {
 #datepicker .ui-datepicker-activerange a {
 	color: #185d7a;
 	background: #d9f1fb;
-	background: -moz-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d9f1fb), color-stop(100%,#c5e3ee));
-	background: -o-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	background: -ms-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	background: linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d9f1fb', endColorstr='#c5e3ee', GradientType=0);
 }
 
 #datepicker .ui-datepicker-days-cell-over a.ui-state-default {
 	color: #fff;
 	border-color: #2fa0c0;
 	background: rgba(73,180,210,0.6);
-	text-shadow: 0px 1px 1px #666;
 	filter: none;
 }
 
 #datepicker .ui-datepicker-activerange a.ui-state-active {
 	color: #fff;
 	background: #00acd4;
-	background: -moz-linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00acd4), color-stop(100%,#008fc7));
-	background: -o-linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	background: -ms-linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	background: linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00acd4', endColorstr='#008fc7', GradientType=0);
 }
 
 #datepicker td.ui-datepicker-week-col {
@@ -115,6 +102,7 @@ body.calendarmain #mainscreen {
 	width: 6px;
 	top: 40px !important;
 	bottom: 0;
+	height: auto;
 	background: url(images/toggle.gif) -1px 48% no-repeat transparent;
 }
 
@@ -208,7 +196,7 @@ pre {
 	height: 22px;
 }
 
-#calendars .treelist li span.calname {
+#calendars .treelist li a.calname {
 	display: block;
 	padding: 0px 18px 2px 2px;
 	position: absolute;
@@ -233,18 +221,18 @@ pre {
 	background-image: none;
 }
 
-#calendars .treelist li div.virtual > span.calname {
+#calendars .treelist li div.virtual > a.calname {
 	color: #aaa;
 	top: 4px;
 	left: 20px;
 }
 
-#calendars .treelist li.x-birthdays span.calname,
-#calendars .treelist li.x-invitations span.calname {
+#calendars .treelist li.x-birthdays a.calname,
+#calendars .treelist li.x-invitations a.calname {
 	font-style: italic;
 }
 
-#calendars .treelist.flat li span.calname {
+#calendars .treelist.flat li a.calname {
 	left: 24px;
 	right: 42px;
 }
@@ -252,17 +240,14 @@ pre {
 #calendars .treelist li span.handle {
 	display: inline-block;
 	position: absolute;
-	top: 8px;
+	top: 7px;
 	right: 6px;
 	padding: 0;
-	width: 10px;
-	height: 10px;
-	border-radius: 7px;
+	width: 11px;
+	height: 11px;
+	border-radius: 8px;
 	font-size: 0.8em;
-	border: 1px solid rgba(0, 0, 0, 0.5);
-	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
+	border: 1px solid rgba(0, 0, 0, 0.4);
 }
 
 #calendars .treelist div span.actions {
@@ -280,15 +265,9 @@ pre {
 #calendars .treelist div:hover span.actions {
 	top: 1px;
 	right: 21px;
-	border: 1px solid #c6c6c6;
+	border: 1px solid #ababab;
 	border-radius: 4px;
-	background: #f7f7f7;
-	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
-	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+	background: #f1f1f1;
 }
 
 #calendars .treelist li a.subscribed {
@@ -397,27 +376,27 @@ pre {
 	background-color: #c7e3ef;
 }
 
-#calendars .treelist li.selected > span.calname {
+#calendars .treelist li.selected > a.calname {
 	font-weight: bold;
 }
 
-#calendars .treelist div.readonly span.calname {
+#calendars .treelist div.readonly a.calname {
 	background-position: right -20px;
 }
 
-#calendars .treelist li.user > div > span.calname {
+#calendars .treelist li.user > div > a.calname {
 	background-position: right -38px;
 }
 /*
-#calendars .treelist div.user.readonly span.calname {
+#calendars .treelist div.user.readonly a.calname {
 	background-position: right -56px;
 }
 
-#calendars .treelist div.shared span.calname {
+#calendars .treelist div.shared a.calname {
 	background-position: right -74px;
 }
 
-#calendars .treelist div.shared.readonly span.calname {
+#calendars .treelist div.shared.readonly a.calname {
 	background-position: right -92px;
 }
 */
@@ -430,13 +409,6 @@ pre {
 	min-width: 1.3em;
 	padding: 2px 4px;
 	background: #005d76;
-	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
-	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: linear-gradient(to bottom, #005d76 0%, #004558 100%);
-	-webkit-box-shadow: inset 0 1px 1px 0 #002635;
-	box-shadow: inset 0 1px 1px 0 #002635;
 	border-radius: 10px;
 	color: #fff;
 	text-align: center;
@@ -461,6 +433,7 @@ pre {
 	background-color: #c7e3ef;
 }
 
+#fburl,
 #calfeedurl,
 #caldavurl {
 	width: 98%;
@@ -544,6 +517,10 @@ body.calendarmain #searchmenulink {
 	display: none;
 }
 
+#calendarform {
+	overflow: visible;
+}
+
 #user {
 	position: absolute;
 	top: 10px;
@@ -626,13 +603,12 @@ a.miniColors-trigger {
 	color: #333;
 	font-weight: bold;
 	padding: 4px 4px 3px 30px;
-	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	line-height: 20px;
 }
 
-#edit-attachments ul li a.file {
+#edit-attachments ul li a.filename {
 	padding: 0;
 }
 
@@ -683,7 +659,7 @@ a.miniColors-trigger {
 }
 
 .event-attendees span.attendee {
-	padding-right: 18px;
+	padding: 1px 18px 1px 0;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.png) right 0 no-repeat;
 }
@@ -734,11 +710,6 @@ a.miniColors-trigger {
 	font-size: 11px;
 	font-weight: bold;
 	background: #d6eaf3;
-	background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
-	background: -webkit-gradient(linear, left top, right top, color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3));
-	background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
-	background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%);
-	background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
 	border: 0;
 	border-bottom: 1px solid #ccc;
 	height: 18px;
@@ -771,29 +742,17 @@ a.miniColors-trigger {
 	margin: 0 -0.2em;
 }
 
-.calendarmain .eventdialog.status-cancelled {
-	background: url(images/badge_cancelled.png) top right no-repeat;
-}
-
-.calendarmain .eventdialog.sensitivity-private {
-	background: url(images/badge_private.png) top right no-repeat;
-}
-
-.calendarmain .eventdialog.sensitivity-confidential {
-	background: url(images/badge_confidential.png) top right no-repeat;
-}
-
-.calendarmain .sensitivity-private #event-title {
-	margin-right: 50px;
-}
-
+.calendarmain .status-cancelled #event-title,
+.calendarmain .sensitivity-private #event-title,
 .calendarmain .sensitivity-confidential #event-title {
-	margin-right: 60px;
+	margin-right: 80px;
 }
 
 .calendarmain .eventdialog div.event-line {
-	margin-top: 0.1em;
-	margin-bottom: 0.3em;
+	margin-bottom: 0.4em;
+	white-space: nowrap;
+	overflow-x: hidden;
+	text-overflow: ellipsis;
 }
 
 .calendarmain .eventdialog div.event-line a.iconbutton {
@@ -805,9 +764,13 @@ a.miniColors-trigger {
 	margin-left: 2em;
 }
 
-.calendarmain .eventdialog #event-rsvp-comment,
-.calendarmain .eventdialog #event-created-changed {
-	margin-top: 0.6em;
+#event-description .event-text,
+#event-attendees .event-text {
+	padding-top: 0.4em;
+}
+
+.eventdialog .spacer {
+	font-size: 4px;
 }
 
 .eventdialog .event-text-old,
@@ -924,6 +887,18 @@ a.miniColors-trigger {
 	visibility: visible;
 }
 
+body.eventdialog {
+	margin: 0;
+	overflow-y: auto;
+}
+
+body.eventdialog #eventedit {
+	display: block;
+	top: 0;
+	padding: 1em;
+	border-bottom: 0;
+}
+
 #eventedit {
 	position: relative;
 	top: -1.5em;
@@ -956,6 +931,10 @@ div.form-section,
 	border-bottom: 2px solid #fafafa;
 }
 
+div.event-section > .col-form-label {
+	float: left;
+}
+
 .calendarmain .eventdialog label,
 #eventedit label,
 .form-section label {
@@ -964,16 +943,6 @@ div.form-section,
 	padding-right: 0.5em;
 }
 
-.calendarmain .eventdialog #event-url .event-text {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-#event-links .attachmentslist {
-	display: inline-block;
-}
-
 #event-links label,
 #edit-event-links label {
 	float: left;
@@ -1026,7 +995,7 @@ td.topalign {
 	padding: 0 0.5em 0.5em 0.5em;
 }
 
-.event-dialog-message,
+.dialog-message,
 .event-update-confirm .message {
 	margin-top: 0.5em;
 	padding: 0.8em;
@@ -1034,7 +1003,7 @@ td.topalign {
 	background-color: #fef893;
 }
 
-.event-dialog-message .message,
+.dialog-message .message,
 .event-update-confirm .message {
 	margin-bottom: 0.5em;
 }
@@ -1047,13 +1016,13 @@ td.topalign {
 	padding-left: 30px;
 }
 
-.event-dialog-message span.ui-icon,
+.dialog-message span.ui-icon,
 .event-update-confirm span.ui-icon {
 	float: left;
 	margin: 0 7px 20px 0;
 }
 
-.event-dialog-message label,
+.dialog-message label,
 .event-update-confirm label {
 	min-width: 3em;
 	padding-right: 1em;
@@ -1112,7 +1081,7 @@ td.topalign {
 
 #eventedit .edit-attendees-table th.invite,
 #eventedit .edit-attendees-table td.invite {
-	width: 44px;
+	width: 50px;
 	padding: 2px;
 }
 
@@ -1212,50 +1181,51 @@ td.topalign {
 	height: 14px;
 	border-radius: 4px;
 	-moz-border-radius: 4px;
+	vertical-align: middle;
 }
 
 .availability img.availabilityicon.loading {
 	background: url(images/loading_blue.gif) center no-repeat;
 }
 
-#schedule-freebusy-times td.unknown,
+#schedule-freebusy-times td div.unknown,
 .availability img.availabilityicon.unknown {
 	background: #ddd;
 }
 
-#schedule-freebusy-times td.free,
+#schedule-freebusy-times td div.free,
 .availability img.availabilityicon.free {
 	background: #abd640;
 }
 
-#schedule-freebusy-times td.busy,
+#schedule-freebusy-times td div.busy,
 .availability img.availabilityicon.busy {
 	background: #e26569;
 }
 
-#schedule-freebusy-times td.tentative,
+#schedule-freebusy-times td div.tentative,
 .availability img.availabilityicon.tentative {
 	background: #8383fc;
 }
 
-#schedule-freebusy-times td.out-of-office,
+#schedule-freebusy-times td div.out-of-office,
 .availability img.availabilityicon.out-of-office {
 	background: #fbaa68;
 }
 
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
+#schedule-freebusy-times td div.all-busy,
+#schedule-freebusy-times td div.all-tentative,
+#schedule-freebusy-times td div.all-out-of-office {
 	background-image: url(images/freebusy-colors.png);
 	background-position: top right;
 	background-repeat: no-repeat;
 }
 
-#schedule-freebusy-times td.all-tentative {
+#schedule-freebusy-times td div.all-tentative {
 	background-position: right -40px;
 }
 
-#schedule-freebusy-times td.all-out-of-office {
+#schedule-freebusy-times td div.all-out-of-office {
 	background-position: right -80px;
 }
 
@@ -1269,10 +1239,6 @@ td.topalign {
 	white-space: nowrap;
 }
 
-#edit-attendees-legend img.availabilityicon {
-	vertical-align: middle;
-}
-
 .edit-attendees-table tbody td.confirmstate {
 	overflow: hidden;
 	white-space: nowrap;
@@ -1286,22 +1252,27 @@ td.topalign {
 }
 
 .edit-attendees-table td.confirmstate span.needs-action {
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.accepted {
 	background-position: 5px -20px;
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.declined {
 	background-position: 5px -40px;
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.tentative {
 	background-position: 5px -60px;
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.delegated {
 	background-position: 5px -180px;
+	height: 14px;
 }
 
 #attendees-freebusy-table {
@@ -1382,7 +1353,8 @@ td.topalign {
 .attendees-list .spacer,
 #schedule-freebusy-times tr.spacer td {
 	background: 0;
-	font-size: 50%;
+	padding: 0;
+	height: 10px;
 }
 
 #schedule-freebusy-times {
@@ -1395,6 +1367,15 @@ td.topalign {
 	border: 1px solid #ccc;
 }
 
+#schedule-freebusy-times tbody td {
+	padding: 0;
+	height: 20px;
+}
+
+#schedule-freebusy-times tbody td div {
+	height: 100%;
+}
+
 #attendees-freebusy-table div.timesheader,
 #schedule-freebusy-times tr.times td {
 	min-width: 30px;
@@ -1410,6 +1391,11 @@ td.topalign {
 
 #schedule-freebusy-times tr.times td {
 	cursor: pointer;
+	white-space: nowrap;
+}
+
+#schedule-freebusy-times #fbrowall td {
+	border-bottom: none;
 }
 
 #schedule-event-time {
@@ -1524,12 +1510,7 @@ a.dropdown-link:after {
 	border-top-color: #ddd;
 	border-bottom-color: #bbb;
 	border-radius: 0 0 4px 4px;
-	background: #ebebeb;
-	background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#c6c6c6));
-	background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
+	background: #eaeaea;
 }
 
 #agendaoptions label {
@@ -1537,20 +1518,6 @@ a.dropdown-link:after {
 	padding-right: 0.5em;
 }
 
-#calendar-kolabform {
-	position: relative;
-	margin: 0 -8px;
-	min-width: 660px;
-	min-height: 400px;
-}
-
-#calendar-kolabform table td.title {
-	font-weight: bold;
-	white-space: nowrap;
-	color: #666;
-	padding-right: 10px;
-}
-
 #resource-selection {
 	position: absolute;
 	top: 0;
@@ -1673,10 +1640,6 @@ a.dropdown-link:after {
 	overflow: hidden;
 	border: 0;
 	border-radius: 4px;
-	box-shadow: 0 0 2px #999;
-	-o-box-shadow: 0 0 2px #999;
-	-webkit-box-shadow: 0 0 2px #999;
-	-moz-box-shadow: 0 0 2px #999;
 }
 
 .calendarmain .fc-content {
@@ -1708,39 +1671,23 @@ a.dropdown-link:after {
 .calendarmain .fc-button.fc-state-default,
 .calendarmain .fc-button.fc-state-hover {
 	background-color: #f5f5f5;
-	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-	background-position: 0 0;
 }
 
 .calendarmain #calendar .fc-button,
 .calendarmain #calendar .fc-button.fc-state-default,
 .calendarmain #calendar .fc-button.fc-state-hover {
-	margin: 0 0 0 0;
-	height: 20px;
-	line-height: 20px;
-	color: #505050;
-	text-shadow: 0px 1px 1px #fff;
-	border: 1px solid #e6e6e6;
-	background: #d8d8d8;
-	background: -moz-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8d8d8), color-stop(100%,#bababa));
-	background: -o-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	background: -ms-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	background: linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	box-shadow: 0 1px 1px 0 #999;
-	-o-box-shadow: 0 1px 1px 0 #999;
-	-webkit-box-shadow: 0 1px 1px 0 #999;
-	-moz-box-shadow: 0 1px 1px 0 #999;
+	margin: -2px 0 0 0;
+	height: 24px;
+	line-height: 24px;
+	color: #333;
+	border: 1px solid #ababab;
+	background: #f1f1f1;
 	text-decoration: none;
+	text-shadow: none;
 }
 
 .calendarmain #calendar .fc-button.fc-state-disabled {
-	color: #999;
-	background: #d8d8d8;
+	color: #666;
 }
 
 .calendarmain .fc-button.fc-state-active,
@@ -1748,12 +1695,8 @@ a.dropdown-link:after {
 .calendarmain #calendar .fc-button.fc-state-active,
 .calendarmain #calendar .fc-button.fc-state-down {
 	color: #333;
-	background: #bababa;
-	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bababa), color-stop(100%,#d8d8d8));
-	background: -o-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-	background: -ms-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
+	background: #f1f1f1;
+	box-shadow: none;
 }
 
 .calendarmain #calendar .fc-header .fc-button {
@@ -1959,6 +1902,12 @@ a.dropdown-link:after {
 	font-weight: bold;
 }
 
+.fc-needs-action,
+.fc-declined,
+.cal-event-status-cancelled {
+	opacity: 0.6;
+}
+
 .cal-event-status-cancelled .fc-event-title {
 	text-decoration: line-through;
 }
@@ -2010,6 +1959,15 @@ div.fc-event-location {
 	background-color: rgba(233,198,14, 0.12);
 }
 
+.fc-widget-header,
+.fc-widget-content {
+	border-color: #bbd3da !important;
+}
+
+.fc-widget-header .fc-agenda-divider-inner {
+	background: #cad2d9 !important;
+}
+
 .fc-widget-header {
 	background-color: #d6eaf3;
 	color: #004458;
@@ -2054,15 +2012,15 @@ div.fc-event-location {
 }
 
 .calendarmain .fc-view-table tr.fc-event td {
-	border-color: #ddd;
-	padding: 4px 7px;
+	border-color: #bbd3da;
+	padding: 6px 8px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 .calendarmain .fc-view-table tr.fc-event td.fc-event-handle {
-	padding: 5px 0 2px 7px;
+	padding: 6px 0 2px 7px;
 	width: 12px;
 }
 
@@ -2085,9 +2043,6 @@ div.fc-event-location {
 	font-size: 10px;
 	border-radius: 8px;
 	border: 1px solid rgba(0, 0, 0, 0.4);
-	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 }
 
 .calendarmain .fc-view-table col.fc-event-location {
@@ -2113,6 +2068,7 @@ div.fc-event-location {
 .fc-listappend .formlinks a {
 	font-size: 12px;
 	padding: 0 0.3em;
+	max-width: initial;
 }
 
 .fc-event-temp {
@@ -2178,6 +2134,11 @@ div.calendar-invitebox td em {
 	font-weight: bold;
 }
 
+div.calendar-invitebox td.date.modified {
+	font-weight: bold;
+	color: red;
+}
+
 #event-rsvp .rsvp-buttons,
 div.calendar-invitebox .itip-buttons div {
 	margin-top: 0.5em;
@@ -2241,6 +2202,7 @@ div.calendar-invitebox .rsvp-status.delegated {
 	background-position: 2px -180px;
 }
 
+#event-partstat .changersvp.unknown,
 #event-partstat .changersvp.needs-action,
 div.calendar-invitebox .rsvp-status.needs-action {
 	background-position: 2px 0;
@@ -2276,6 +2238,11 @@ div.calendar-invitebox .calendar-agenda-preview .event-row.no-event {
 	font-style: italic;
 }
 
+div.calendar-invitebox .calendar-agenda-preview .event-row.fc-invitation-needs-action {
+	font-style: italic;
+	opacity: .5;
+}
+
 div.calendar-invitebox .calendar-agenda-preview .event-date {
 	display: inline-block;
 	min-width: 8em;
diff --git a/plugins/calendar/skins/larry/fullcalendar.css b/plugins/calendar/skins/larry/fullcalendar.css
index daefdf24..80a47734 100644
--- a/plugins/calendar/skins/larry/fullcalendar.css
+++ b/plugins/calendar/skins/larry/fullcalendar.css
@@ -392,7 +392,7 @@ table.fc-border-separate {
 
 .fc .fc-week-number {
 	width: 22px;
-	text-align: center;
+	text-align: center !important;
 	}
 
 .fc .fc-week-number div {
diff --git a/plugins/calendar/skins/larry/images/badge_cancelled.png b/plugins/calendar/skins/larry/images/badge_cancelled.png
deleted file mode 100644
index 2eb48784..00000000
Binary files a/plugins/calendar/skins/larry/images/badge_cancelled.png and /dev/null differ
diff --git a/plugins/calendar/skins/larry/images/badge_confidential.png b/plugins/calendar/skins/larry/images/badge_confidential.png
deleted file mode 100644
index 04a20528..00000000
Binary files a/plugins/calendar/skins/larry/images/badge_confidential.png and /dev/null differ
diff --git a/plugins/calendar/skins/larry/images/badge_private.png b/plugins/calendar/skins/larry/images/badge_private.png
deleted file mode 100644
index 52e4dbe6..00000000
Binary files a/plugins/calendar/skins/larry/images/badge_private.png and /dev/null differ
diff --git a/plugins/calendar/skins/larry/images/calendars.png b/plugins/calendar/skins/larry/images/calendars.png
index 5b5ca85b..41421a16 100644
Binary files a/plugins/calendar/skins/larry/images/calendars.png and b/plugins/calendar/skins/larry/images/calendars.png differ
diff --git a/plugins/calendar/skins/larry/images/sendinvitation.png b/plugins/calendar/skins/larry/images/sendinvitation.png
index dea30fab..5e639c48 100644
Binary files a/plugins/calendar/skins/larry/images/sendinvitation.png and b/plugins/calendar/skins/larry/images/sendinvitation.png differ
diff --git a/plugins/calendar/skins/larry/images/toolbar.png b/plugins/calendar/skins/larry/images/toolbar.png
index 5e79c667..5fe9f773 100644
Binary files a/plugins/calendar/skins/larry/images/toolbar.png and b/plugins/calendar/skins/larry/images/toolbar.png differ
diff --git a/plugins/calendar/skins/larry/print.iehacks.css b/plugins/calendar/skins/larry/print.iehacks.css
deleted file mode 100644
index 5322ff99..00000000
--- a/plugins/calendar/skins/larry/print.iehacks.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* CSS hacks for IE 7 */
-
-#calendar {
-	top: 5em;
-}
-
-.calwidth {
-	width: 172mm;
-}
-
-.fc-header-title h2 {
-	font-size: 16px;
-}
-
-#calendarlist li {
-	float: none;
-	padding: 0;
-	margin-left: 1em;
-}
-
-@media print {
-	#calendar {
-		top: 0;
-	}
-}
\ No newline at end of file
diff --git a/plugins/calendar/skins/larry/templates/attachment.html b/plugins/calendar/skins/larry/templates/attachment.html
deleted file mode 100644
index 17fccc54..00000000
--- a/plugins/calendar/skins/larry/templates/attachment.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="extwin calendar attachmentwin">
-
-<div id="header">
-<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
-	<div class="topleft">
-		<roundcube:container name="topline-left" id="topline-left" />
-	</div>
-	<roundcube:container name="topline-center" id="topline-center" />
-	<div class="topright">
-		<roundcube:container name="topline-right" id="topline-right" />
-		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
-	</div>
-</div>
-</div>
-
-<div id="mainscreen">
-
-<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
-
-<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
-<div id="attachmenttoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
-	<roundcube:button command="download-attachment" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" title="download" />
-	<roundcube:button command="print-attachment" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
-	<roundcube:container name="toolbar" id="messagetoolbar" />
-</div>
-
-<div id="mainscreencontent">
-
-	<div id="partheader" class="uibox listbox" role="contentinfo" aria-labelledby="aria-label-contentinfo">
-		<h2 class="boxtitle" id="aria-label-contentinfo"><roundcube:label name="properties" /></h2>
-		<div class="scroller">
-			<roundcube:object name="plugin.attachmentcontrols" class="listing" />
-		</div>
-	</div>
-
-	<div id="attachmentcontainer" class="uibox" role="main" aria-labelledby="aria-label-messagepart">
-		<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
-		<div class="iframebox">
-		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" frameborder="0" title="arialabelattachmentpreview" />
-		</div>
-	</div>
-
-</div>
-
-</div>
-
-<script type="text/javascript">
-
-$(document).ready(function() {
-	if (window.rcube_splitter) {
-		new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
-			orientation:'v', relative:true, start:226, min:150, size:12}).init();
-	}
-});
-
-</script>
-</body>
-</html>
diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index 8dc779d5..d59c299f 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -35,7 +35,7 @@
 					<label for="calendarlistsearch" class="voice"><roundcube:label name="calendar.searchterms" /></label>
 					<input type="text" name="q" id="calendarlistsearch" placeholder="<roundcube:label name='calendar.findcalendars' />" />
 					<a class="iconbutton searchicon"></a>
-					<roundcube:button command="reset-listsearch" id="calendarlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+					<roundcube:button type="link" command="reset-listsearch" id="calendarlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller withfooter">
@@ -52,12 +52,12 @@
 		<label for="quicksearchbox" class="voice"><roundcube:label name="calendar.arialabelquicksearchbox" /></label>
 		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
 		<a id="searchmenulink" class="iconbutton searchoptions" tabindex="-1"> </a>
-		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+		<roundcube:button type="link" command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
 
 	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
 	<div id="calendar" role="main" aria-labelledby="aria-label-calendarview">
-		<roundcube:object name="plugin.angenda_options" class="boxfooter" id="agendaoptions" />
+		<roundcube:object name="plugin.agenda_options" class="boxfooter" id="agendaoptions" />
 	</div>
 </div>
 
@@ -68,42 +68,45 @@
 <div id="calendaroptionsmenu" class="popupmenu" aria-hidden="true">
 	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
 	<ul id="calendaroptionsmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-calendaroptions">
-		<li role="menuitem"><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
-		<li role="menuitem"><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="calendar-edit" label="calendar.edit" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="calendar-delete" label="delete" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
-		<li role="menuitem"><roundcube:button command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
+		<roundcube:endif />
+		<li role="menuitem"><roundcube:button type="link" command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
+		<roundcube:if condition="!empty(env:calendar_settings['freebusy_url'])" />
+		<li role="menuitem"><roundcube:button type="link" command="calendar-showfburl" label="calendar.showfburl" classAct="active" /></li>
 		<roundcube:endif />
-		<li role="menuitem"><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
-		<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
 		<roundcube:endif />
 	</ul>
 </div>
 
 <div id="eventshow" class="uidialog eventdialog" aria-hidden="true">
 	<h1 id="event-title">Event Title</h1>
+	<div id="event-status-badge"><span></span></div>
 	<div class="event-section" id="event-location">Location</div>
 	<div class="event-section" id="event-date">From-To</div>
 	<div class="event-section" id="event-description">
-		<h5 class="label"><roundcube:label name="calendar.description" /></h5>
-		<div class="event-text"></div>
-	</div>
-	<div class="event-section" id="event-url">
-		<h5 class="label"><roundcube:label name="calendar.url" /></h5>
-		<div class="event-text"></div>
-	</div>
-	<div class="event-section" id="event-repeat">
-		<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
-		<div class="event-text"></div>
-	</div>
-	<div class="event-section" id="event-alarm">
-		<h5 class="label"><roundcube:label name="calendar.alarms" /></h5>
 		<div class="event-text"></div>
 	</div>
 	<div class="event-section event-attendees" id="event-attendees">
-		<h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
 		<div class="event-text"></div>
 	</div>
+	<div class="spacer">&nbsp;</div>
+	<div class="event-line" id="event-url">
+		<label><roundcube:label name="calendar.url" /></label>
+		<span class="event-text"></span>
+	</div>
+	<div class="event-line" id="event-repeat">
+		<label><roundcube:label name="calendar.repeat" /></label>
+		<span class="event-text"></span>
+	</div>
+	<div class="event-line" id="event-alarm">
+		<label><roundcube:label name="calendar.alarms" /></label>
+		<span class="event-text"></span>
+	</div>
 	<div class="event-line" id="event-partstat">
 		<label><roundcube:label name="calendar.mystatus" /></label>
 		<span class="changersvp" role="button" tabindex="0" title="<roundcube:label name='calendar.changepartstat' />">
@@ -131,19 +134,12 @@
 		<label><roundcube:label name="calendar.priority" /></label>
 		<span class="event-text"></span>
 	</div>
+	<!--
 	<div class="event-line" id="event-sensitivity">
 		<label><roundcube:label name="calendar.sensitivity" /></label>
 		<span class="event-text"></span>
 	</div>
-	<div class="event-section" id="event-links">
-		<label><roundcube:label name="calendar.links" /></label>
-		<span class="event-text"></span>
-		<br style="clear:left">
-	</div>
-	<div class="event-section" id="event-attachments">
-		<label><roundcube:label name="attachments" /></label>
-		<div class="event-text"></div>
-	</div>
+	-->
 	<div class="event-line" id="event-created-changed">
 		<label><roundcube:label name="calendar.created" /></label>
 		<span class="event-text event-created"></span>
@@ -154,17 +150,25 @@
 		<label><roundcube:label name="calendar.rsvpcomment" /></label>
 		<span class="event-text"></span>
 	</div>
+	<div class="event-section" id="event-links">
+		<label><roundcube:label name="calendar.links" /></label>
+		<span class="event-text"></span>
+	</div>
+	<div class="event-section" id="event-attachments">
+		<div class="event-text"></div>
+	</div>
 
-	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="event-dialog-message" style="display:none" />
+	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="dialog-message" style="display:none" />
 </div>
 
 <div id="eventoptionsmenu" class="popupmenu" aria-hidden="true">
 	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
 	<ul id="eventoptionsmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-eventoptions">
-		<li role="menuitem"><roundcube:button command="event-download" label="download" classAct="active" /></li>
-		<li role="menuitem"><roundcube:button command="event-sendbymail" label="send" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-download" label="download" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-sendbymail" label="send" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-copy" label="copy" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab' && config:kolab_bonnie_api" />
-		<li role="menuitem"><roundcube:button command="event-history" type="link" label="calendar.eventhistory" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-history" label="calendar.eventhistory" classAct="active" /></li>
 		<roundcube:endif />
 	</ul>
 </div>
@@ -263,7 +267,7 @@
 					<label for="resourcesearchbox" class="voice"><roundcube:label name="calendar.searchterms" /></label>
 					<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
 					<a id="resourcesearchmenulink" class="iconbutton searchoptions"> </a>
-					<roundcube:button command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+					<roundcube:button type="link" command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller">
@@ -297,7 +301,7 @@
 	<div class="schedule-options">
 		&nbsp;
 		<div class="schedule-buttons">
-			<button id="shedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button><button id="shedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
+			<button type="button" id="schedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button><button type="button" id="schedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
 		</div>
 	</div>
 
@@ -315,8 +319,8 @@
 	</div>
 	<div style="float:left">
 		<div class="schedule-find-buttons">
-			<button id="shedule-find-prev">&#9668; <roundcube:label name="calendar.prevslot" /></button>
-			<button id="shedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
+			<button type="button" id="schedule-find-prev">&#9668; <roundcube:label name="calendar.prevslot" /></button>
+			<button type="button" id="schedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
 		</div>
 		<div class="schedule-options">
 			<label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" /><roundcube:label name="calendar.onlyworkinghours" /></label>
@@ -360,6 +364,11 @@
 	</div>
 </div>
 
+<div id="fburlbox" class="uidialog">
+	<p><roundcube:label name="calendar.fburldescription" /></p>
+	<textarea id="fburl" rows="2" readonly="readonly"></textarea>
+</div>
+
 <roundcube:object name="plugin.calendar_css" />
 
 <script type="text/javascript">
@@ -368,8 +377,6 @@
 var UI = new rcube_mail_ui();
 
 $(document).ready(function(e){
-	UI.init();
-
 	new calendarview_splitter({ id:'calsidebarsplitter', p1:'#calendarsidebar', p2:'#calendar',
 		orientation:'v', relative:true, start:280, min:260, size:12, offset:0 });
 
diff --git a/plugins/calendar/skins/larry/templates/dialog.html b/plugins/calendar/skins/larry/templates/dialog.html
new file mode 100644
index 00000000..4e1bf218
--- /dev/null
+++ b/plugins/calendar/skins/larry/templates/dialog.html
@@ -0,0 +1,12 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="iframe eventdialog noscroll">
+
+<roundcube:include file="/templates/eventedit.html" />
+
+</body>
+</html>
diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index 42c20080..6f96b18f 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -1,4 +1,4 @@
-<div id="eventedit" class="uidialog uidialog-tabbed" aria-hidden="true">
+<div id="eventedit" class="<roundcube:exp expression="env:framed ? '' : 'uidialog '">uidialog-tabbed" aria-hidden="true">
 	<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#event-panel-summary"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li><li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
@@ -119,15 +119,18 @@
 			<div id="edit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="attachmentlist" class="attachmentslist" />
 			</div>
-			<div id="edit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+			<div id="edit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform" style="text-align:center">
 				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
-				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
+				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" mode="hint" />
+				<a class="button" tabindex="1" href="#" onclick="rcmail.upload_input('edit-attachment-form')"><roundcube:label name="addattachment" /></a>
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />
 		</div>
 	</form>
 
-	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" />
-	<roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" />
-	<div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
+	<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_recurring_warning" class="dialog-message edit-recurring-warning" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="edit-attachment-form" mode="smart" />
+	<div id="edit-localchanges-warning" class="dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
 </div>
\ No newline at end of file
diff --git a/plugins/calendar/skins/larry/templates/itipattend.html b/plugins/calendar/skins/larry/templates/itipattend.html
index 545d0189..20b4acab 100644
--- a/plugins/calendar/skins/larry/templates/itipattend.html
+++ b/plugins/calendar/skins/larry/templates/itipattend.html
@@ -7,17 +7,9 @@
 <body class="extwin calendaritipattend">
 
 <div id="header">
-<div id="topline">
-	<div class="topright">
-		<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
-	</div>
-</div>
-
 <div id="topnav">
 	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
 </div>
-
-<br style="clear:both" />
 </div>
 
 <div id="mainscreen">
diff --git a/plugins/calendar/skins/larry/templates/kolabform.html b/plugins/calendar/skins/larry/templates/kolabform.html
deleted file mode 100644
index 77a1c30e..00000000
--- a/plugins/calendar/skins/larry/templates/kolabform.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="calendar-kolabform" class="propform tabbed">
-	<roundcube:object name="calendarform" />
-</div>
-<style type="text/css">
-#calendarpropform { min-width:680px; margin-top:-12px; }
-</style>
-<script type="text/javascript">
-UI.init_tabs('#calendar-kolabform');
-</script>
\ No newline at end of file
diff --git a/plugins/calendar/skins/larry/templates/print.html b/plugins/calendar/skins/larry/templates/print.html
index e679f729..37471d96 100644
--- a/plugins/calendar/skins/larry/templates/print.html
+++ b/plugins/calendar/skins/larry/templates/print.html
@@ -24,6 +24,5 @@
 
 <roundcube:object name="plugin.calendar_css" printmode="true" />
 
-<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="plugins/calendar/skins/classic/print.iehacks.css" /><![endif]-->
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/html_converter/composer.json b/plugins/html_converter/composer.json
new file mode 100644
index 00000000..ea8e8ccc
--- /dev/null
+++ b/plugins/html_converter/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "kolab/html_converter",
+    "type": "roundcube-plugin",
+    "description": "Better HTML to Text converter that uses text-based browser (lynx) for this task",
+    "homepage": "https://git.kolab.org/diffusion/RPK/",
+    "license": "AGPLv3",
+    "version": "3.4.0",
+    "authors": [
+        {
+            "name": "Aleksander Machniak",
+            "email": "machniak@kolabsys.com",
+            "role": "Lead"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3"
+    }
+}
diff --git a/plugins/html_converter/html_converter.php b/plugins/html_converter/html_converter.php
new file mode 100644
index 00000000..1959f31b
--- /dev/null
+++ b/plugins/html_converter/html_converter.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * HTML-to-Text conversion using lynx browser
+ *
+ * @version 0.1
+ * @license GNU GPLv3+
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2016, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class html_converter extends rcube_plugin
+{
+    private static $replaces = array(
+        "<blockquote>"  => "<br>&amp;&raquo;&amp;<br>",
+        "</blockquote>" => "<br>&amp;&laquo;&amp;<br>",
+        "\x02\x03"      => "***^^^SIG^^^***",
+    );
+
+
+    /**
+     * Plugin initialization.
+     */
+    function init()
+    {
+        // register hook to convert HTML to Text
+        $this->add_hook('html2text', array($this, 'html2text'));
+    }
+
+    /**
+     * Hook to convert HTML to Text.
+     * Arguments: body, width, links, charset
+     */
+    public function html2text($p)
+    {
+        // prepare HTML content for conversion
+        $html = $this->prefilter($p['body']);
+
+        // convert HTML to text
+        $result = $this->convert($html, $p);
+
+        // on success skip default rcube_html2text conversion
+        if ($result !== false) {
+            $result = $this->postfilter($result);
+
+            $p['body']  = $result;
+            $p['abort'] = true;
+        }
+
+        return $p;
+    }
+
+    /**
+     * Html to text converter
+     */
+    private function convert($html, $p)
+    {
+        if (empty($html)) {
+            return false;
+        }
+
+        $rcmail   = rcmail::get_instance();
+        $temp_dir = $rcmail->config->get('temp_dir');
+        $tmpfname = tempnam($temp_dir, 'rcmHtml');
+
+        // write HTML to temp file
+        if (!file_put_contents($tmpfname, $html)) {
+            return false;
+        }
+
+        $args = array(
+            '{path}'    => $tmpfname,
+            '{width}'   => (int) $p['width'],
+            '{charset}' => $p['charset'],
+            '{links}'   => $p['links'] ? 1 : 0,
+        );
+/*
+        $command = 'links -force-html -no-connect -no-g -codepage {charset}'
+            . ' -aggressive-cache 0 -html-margin 0 -html-numbered-links {links}'
+            . ' -width {width} -dump {path}';
+*/
+        $command = 'lynx -force_html -noreferer -nomargins -dont_wrap_pre'
+            . ' -nolist -display_charset={charset} -width={width} -dump {path}';
+
+        $command = str_replace(array_keys($args), array_values($args), $command);
+
+        if ($p['links']) {
+            $command = str_replace(' -nolist', '', $command);
+        }
+
+        // convert HTML to text
+        ob_start();
+        passthru($command, $status);
+        $result = ob_get_contents();
+        ob_end_clean();
+
+        // remove temp file
+        unlink($tmpfname);
+
+        if ($status) {
+            rcube::raise_error(array(
+                    'line'    => __LINE__,
+                    'file'    => __FILE__,
+                    'message' => "Failed executing: $command (code: $status)"
+                ), true, false);
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * HTML content preparation for conversion.
+     */
+    private function prefilter($html)
+    {
+        // blockquotes are ignored by links, so we replace them
+        // with special code that will be handled later in postfilter
+
+        // the same for special signature-replacement sequence
+        // which is used in compose editor
+
+        $html = str_ireplace(array_keys(self::$replaces), array_values(self::$replaces), $html);
+
+        return $html;
+    }
+
+    /**
+     * Post-filtering on plain text content.
+     */
+    function postfilter($text)
+    {
+        $replaces = self::$replaces;
+
+        unset($replaces['<blockquote>']);
+        unset($replaces['</blockquote>']);
+
+        // replace special sequences
+        $text = str_replace(array_values($replaces), array_keys($replaces), $text);
+
+        // blockquotes handling after conversion
+        $start = str_replace('<br>', '', self::$replaces['<blockquote>']);
+        $end   = str_replace('<br>', '', self::$replaces['</blockquote>']);
+        $start = html_entity_decode($start, ENT_COMPAT, 'UTF-8');
+        $end   = html_entity_decode($end, ENT_COMPAT, 'UTF-8');
+
+        if (strpos($text, $start) !== false) {
+            $last   = false;
+            $level  = 0;
+            $result = explode("\n", $text);
+
+            foreach ($result as $idx => $line) {
+                if ($line === $start) {
+                    $level++;
+                    $last = true;
+                    unset($result[$idx]);
+                }
+                else if ($line === $end) {
+                    $level--;
+                    $last = true;
+                    unset($result[$idx]);
+                }
+                else if ($last && !strlen($line)) {
+                    unset($result[$idx]);
+                    $last = false;
+                }
+                else if ($level) {
+                    $len = strlen($line);
+
+                    if (!$len && isset($result[$idx+1])
+                        && ($result[$idx+1] === $end || $result[$idx+1] === $start)
+                    ) {
+                        unset($result[$idx]);
+                    }
+                    else {
+                        $result[$idx] = str_repeat('>', $level) . ($len ? ' ' . $line : '');
+                    }
+                }
+            }
+
+            $text = implode("\n", $result);
+        }
+
+        return $text;
+    }
+}
diff --git a/plugins/kolab_2fa/composer.json b/plugins/kolab_2fa/composer.json
index 72223c93..e7ee99fe 100644
--- a/plugins/kolab_2fa/composer.json
+++ b/plugins/kolab_2fa/composer.json
@@ -4,7 +4,7 @@
     "description": "Kolab 2-Factor Authentication",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "0.1.0",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/kolab_2fa/config.inc.php.dist b/plugins/kolab_2fa/config.inc.php.dist
index a601823b..f6f29940 100644
--- a/plugins/kolab_2fa/config.inc.php.dist
+++ b/plugins/kolab_2fa/config.inc.php.dist
@@ -99,7 +99,7 @@ $config['kolab_2fa_storage_config'] = array(
 // $config['kolab_2fa_check'] = true;
 
 // timeout for 2nd factor auth submission (in seconds)
-$config['kolab_2fa_timeout'] = 60;
+$config['kolab_2fa_timeout'] = 120;
 
 // configuration parameters for TOTP (uncomment to adjust)
 $config['kolab_2fa_totp'] = array(
@@ -121,4 +121,5 @@ $config['kolab_2fa_yubikey'] = array(
     'clientid' => '123456',
     'apikey' => '<your-server-api-key>',
     // 'hosts'  => array('api.myhost1.com','api2.myhost.com'),
+    'use_https' => true,  // connect via https if set to true
 );
\ No newline at end of file
diff --git a/plugins/kolab_2fa/kolab2fa.js b/plugins/kolab_2fa/kolab2fa.js
index 6fb3a4ff..9114a3f3 100644
--- a/plugins/kolab_2fa/kolab2fa.js
+++ b/plugins/kolab_2fa/kolab2fa.js
@@ -29,7 +29,11 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     var highsec_call_stack = [];
     var highsec_dialog;
     var factor_dialog;
-    
+
+    if (!rcmail.env.kolab_2fa_factors) {
+        rcmail.env.kolab_2fa_factors = {};
+    }
+
     /**
      * Equivalend of PHP time()
      */
@@ -47,10 +51,13 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
         var rows = 0;
         $.each(rcmail.env.kolab_2fa_factors, function(id, props) {
             if (props.active) {
-                var tr = $('<tr>').addClass(props.method).appendTo(table);
+                var tr = $('<tr>').addClass(props.method).appendTo(table),
+                    button = $('<a class="button icon delete">').attr({href: '#', rel: id})
+                        .append($('<span class="inner">').text(rcmail.get_label('remove','kolab_2fa')));
+
                 $('<td>').addClass('name').text(props.label || props.name).appendTo(tr);
                 $('<td>').addClass('created').text(props.created || '??').appendTo(tr);
-                $('<td>').addClass('actions').html('<a class="button delete" rel="'+id+'">' + rcmail.get_label('remove','kolab_2fa') + '</a>').appendTo(tr);
+                $('<td>').addClass('actions buttons-cell').append(button).appendTo(tr);
                 rows++;
             }
         });
@@ -76,13 +83,14 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
                 [
                     {
                         text: rcmail.gettext('save', 'kolab_2fa'),
-                        'class': 'mainaction',
+                        'class': 'mainaction save',
                         click: function(e) {
                             save_data(method);
                         }
                     },
                     {
                         text: rcmail.gettext('cancel'),
+                        'class': 'cancel',
                         click: function() {
                             factor_dialog.dialog('close');
                         }
@@ -102,7 +110,6 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
                     }
                 }
             )
-            .addClass('propform')
             .data('method', method)
             .data('timestamp', time());
 
@@ -220,10 +227,11 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
                                     highsec_dialog.find('input[name="_code"]').select();
                                 }
                             },
-                            'class': 'mainaction'
+                            'class': 'mainaction save'
                         },
                         {
                             text: rcmail.gettext('cancel'),
+                            'class': 'cancel',
                             click: function() {
                                 highsec_dialog.dialog('close');
                             }
diff --git a/plugins/kolab_2fa/kolab_2fa.php b/plugins/kolab_2fa/kolab_2fa.php
index 3fe87412..f3f85197 100644
--- a/plugins/kolab_2fa/kolab_2fa.php
+++ b/plugins/kolab_2fa/kolab_2fa.php
@@ -3,8 +3,6 @@
 /**
  * Kolab 2-Factor-Authentication plugin
  *
- * ...
- *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
@@ -252,8 +250,14 @@ class kolab_2fa extends rcube_plugin
             }
 
             $field_id = "rcmlogin2fa$method";
-            $input_code = new html_inputfield(array('name' => "_${nonce}_${method}", 'class' => 'kolab2facode', 'id' => $field_id, 'required' => $required, 'autocomplete' => 'off')
-                + $attrib);
+            $input_code = new html_inputfield(array(
+                    'name'         => "_${nonce}_${method}",
+                    'class'        => 'kolab2facode',
+                    'id'           => $field_id,
+                    'required'     => $required,
+                    'autocomplete' => 'off',
+                    'data-icon'    => 'key' // for Elastic
+                ) + $attrib);
             $table->add('title', html::label($field_id, html::quote($this->gettext($method))));
             $table->add('input', $input_code->show(''));
         }
@@ -266,9 +270,12 @@ class kolab_2fa extends rcube_plugin
 
         // add submit button
         if (rcube_utils::get_boolean($attrib['submit'])) {
-            $submit = new html_inputfield(array('type' => 'submit', 'id' => 'rcmloginsubmit',
-                'class' => 'button mainaction', 'value' => $this->gettext('continue')));
-            $out .= html::p('formbuttons', $submit->show());
+            $out .= html::p('formbuttons', html::tag('button', array(
+                    'type'  => 'submit',
+                    'id'    => 'rcmloginsubmit',
+                    'class' => 'button mainaction save',
+                ), $this->gettext('continue'))
+            );
         }
 
         // surround html output with a form tag
@@ -280,14 +287,19 @@ class kolab_2fa extends rcube_plugin
     }
 
     /**
-     * Load driver class for the given method
+     * Load driver class for the given authentication factor
+     *
+     * @param string $factor Factor identifier (<method>:<id>)
+     * @return Kolab2FA\Driver\Base
      */
-    public function get_driver($method)
+    public function get_driver($factor)
     {
+        list($method) = explode(':', $factor, 2);
+
         $rcmail = rcmail::get_instance();
 
-        if ($this->drivers[$method]) {
-            return $this->drivers[$method];
+        if ($this->drivers[$factor]) {
+            return $this->drivers[$factor];
         }
 
         $config = $rcmail->config->get('kolab_2fa_' . $method, array());
@@ -300,7 +312,7 @@ class kolab_2fa extends rcube_plugin
         try {
             // TODO: use external auth service if configured
 
-            $driver = \Kolab2FA\Driver\Base::factory($method, $config);
+            $driver = \Kolab2FA\Driver\Base::factory($factor, $config);
 
             // attach storage
             $driver->storage = $this->get_storage();
@@ -309,7 +321,7 @@ class kolab_2fa extends rcube_plugin
                 $driver->username  = $rcmail->get_user_name();
             }
 
-            $this->drivers[$method] = $driver;
+            $this->drivers[$factor] = $driver;
             return $driver;
         }
         catch (Exception $e) {
@@ -372,7 +384,7 @@ class kolab_2fa extends rcube_plugin
         // register as settings action
         $args['actions'][] = array(
             'action' => 'plugin.kolab-2fa',
-            'class'  => '2factorauth',
+            'class'  => 'twofactorauth',
             'label'  => 'settingslist',
             'title'  => 'settingstitle',
             'domain' => 'kolab_2fa',
@@ -410,7 +422,9 @@ class kolab_2fa extends rcube_plugin
     {
         $rcmail = rcmail::get_instance();
 
-        $select = new html_select(array('id' => 'kolab2fa-add'));
+        $attrib['id'] = 'kolab2fa-add';
+
+        $select = new html_select($attrib);
         $select->add($this->gettext('addfactor') . '...', '');
         foreach ((array)$rcmail->config->get('kolab_2fa_drivers', array()) as $method) {
             $select->add($this->gettext($method), $method);
@@ -454,7 +468,7 @@ class kolab_2fa extends rcube_plugin
         }
 
         $me = $this;
-        $this->api->output->set_env('kolab_2fa_factors', array_combine(
+        $factors = array_combine(
             $factors,
             array_map(function($id) use ($me, &$env_methods) {
                 $props = array('id' => $id);
@@ -468,9 +482,10 @@ class kolab_2fa extends rcube_plugin
 
                 return $props;
             }, $factors)
-        ));
+        );
 
         $this->api->output->set_env('kolab_2fa_methods', $env_methods);
+        $this->api->output->set_env('kolab_2fa_factors', !empty($factors) ? $factors : null);
 
         return html::div(array('id' => 'kolab2fapropform'), $out);
     }
@@ -509,7 +524,7 @@ class kolab_2fa extends rcube_plugin
                 }
 
                 $explain_label = $field . 'explain' . $method;
-                $explain_html = $rcmail->text_exists($explain_label, 'kolab_2fa') ? html::p('explain', $this->gettext($explain_label)) : '';
+                $explain_html = $rcmail->text_exists($explain_label, 'kolab_2fa') ? html::div('explain form-text', $this->gettext($explain_label)) : '';
 
                 $field_id = 'rcmk2fa' . $method . $field;
                 $table->add('title', html::label($field_id, $this->gettext($field)));
@@ -520,12 +535,8 @@ class kolab_2fa extends rcube_plugin
             if (method_exists($driver, 'get_provisioning_uri')) {
                 $table->add('title', $this->gettext('qrcode'));
                 $table->add(null,
-                    html::p('explain',
-                        $this->gettext("qrcodeexplain$method")
-                    ) .
-                    html::p(null,
-                        html::tag('img', array('src' => 'data:image/gif;base64,R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7', 'class' => 'qrcode', 'rel' => $method))
-                    )
+                    html::div('explain form-text', $this->gettext("qrcodeexplain$method"))
+                    . html::tag('img', array('src' => 'data:image/gif;base64,R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7', 'class' => 'qrcode', 'rel' => $method))
                 );
 
                 // add row for testing the factor
@@ -533,7 +544,7 @@ class kolab_2fa extends rcube_plugin
                 $table->add('title', html::label($field_id, $this->gettext('verifycode')));
                 $table->add(null,
                     html::tag('input', array('type' => 'text', 'name' => '_verify_code', 'id' => $field_id, 'class' => 'k2fa-verify', 'size' => 20, 'required' => true)) .
-                    html::p('explain', $this->gettext("verifycodeexplain$method"))
+                    html::div('explain form-text', $this->gettext("verifycodeexplain$method"))
                 );
 
             }
@@ -543,8 +554,9 @@ class kolab_2fa extends rcube_plugin
             $out .= html::tag('form', array(
                     'method' => 'post',
                     'action' => '#',
-                    'id' => 'kolab2fa-prop-' . $method,
-                    'style' => 'display:none',
+                    'id'     => 'kolab2fa-prop-' . $method,
+                    'style'  => 'display:none',
+                    'class'  => 'propform',
                 ),
                 html::tag('fieldset', array(),
                     html::tag('legend', array(), $this->gettext($method)) .
@@ -556,9 +568,9 @@ class kolab_2fa extends rcube_plugin
 
         return $out;
     }
-    
+
     /**
-     * Render th
+     * Render the high-security-dialog content
      */
     public function settings_highsecuritydialog($attrib = array())
     {
@@ -566,10 +578,11 @@ class kolab_2fa extends rcube_plugin
 
         $field_id = 'rcmk2facode';
         $input = new html_inputfield(array('name' => '_code', 'id' => $field_id, 'class' => 'verifycode', 'size' => 20));
+        $label = html::label(array('for' => $field_id, 'class' => 'col-form-label col-sm-4'), '$name');
 
         return html::div($attrib,
-            html::p('explain', $this->gettext('highsecuritydialog')) .
-            html::div('propform', html::label($field_id, '$name') . $input->show(''))
+            html::div('explain form-text', $this->gettext('highsecuritydialog'))
+            . html::div('propform row form-group', $label . html::div('col-sm-8', $input->show('')))
         );
     }
 
@@ -635,7 +648,10 @@ class kolab_2fa extends rcube_plugin
 
         if ($success) {
             $this->api->output->show_message($data === false ? $this->gettext('factorremovesuccess') : $this->gettext('factorsavesuccess'), 'confirmation');
-            $this->api->output->command('plugin.save_success', array('method' => $method, 'active' => $data !== false) + $save_data);
+            $this->api->output->command('plugin.save_success', array(
+                    'method' => $method,
+                    'active' => $data !== false,
+                    'id'     => $driver->id) + $save_data);
         }
         else if ($errors) {
             $this->api->output->show_message($this->gettext('factorsaveerror'), 'error');
@@ -702,6 +718,7 @@ class kolab_2fa extends rcube_plugin
                     }
                 }
             }
+
             $success = $driver->verify(rcube_utils::get_input_value('_code', rcube_utils::INPUT_POST), $timestamp);
             $method = $driver->method;
         }
@@ -717,6 +734,7 @@ class kolab_2fa extends rcube_plugin
             'message' => str_replace('$method', $this->gettext($method),
                 $this->gettext($success ? 'codeverificationpassed' : 'codeverificationfailed'))
         ));
+
         $this->api->output->send();
     }
 
diff --git a/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php b/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php
index 638e65b3..b6fbf86b 100644
--- a/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php
+++ b/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php
@@ -27,12 +27,6 @@ class Yubikey extends Base
 {
     public $method = 'yubikey';
 
-    protected $config = array(
-        'clientid' => '42',
-        'apikey'   => 'FOOBAR=',
-        'hosts'    => null,
-    );
-
     protected $backend;
 
     /**
@@ -57,6 +51,10 @@ class Yubikey extends Base
         if (!empty($this->config['hosts'])) {
             $this->backend->setHosts((array)$this->config['hosts']);
         }
+
+        if (isset($this->config['use_https'])) {
+            $this->backend->setUseSecure((bool)$this->config['use_https']);
+        }
     }
 
     /**
@@ -84,7 +82,7 @@ class Yubikey extends Base
             }
         }
 
-        // rcube::console('VERIFY TOTP', $this->username, $keyid, $code, $pass);
+        // rcube::console('VERIFY Yubikey', $this->username, $keyid, $code, $pass);
         return $pass;
     }
 
diff --git a/plugins/kolab_2fa/localization/bg.inc b/plugins/kolab_2fa/localization/bg.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/bg.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/bg_BG.inc b/plugins/kolab_2fa/localization/bg_BG.inc
new file mode 100644
index 00000000..21c68131
--- /dev/null
+++ b/plugins/kolab_2fa/localization/bg_BG.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Създаден';
+$labels['remove'] = 'Изтриване';
+$labels['label'] = 'Име';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/ca_ES.inc b/plugins/kolab_2fa/localization/ca_ES.inc
new file mode 100644
index 00000000..7470f949
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ca_ES.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Creat';
+$labels['remove'] = 'Suprimeix';
+$labels['label'] = 'Nom';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/cs_CZ.inc b/plugins/kolab_2fa/localization/cs_CZ.inc
new file mode 100644
index 00000000..3978b92c
--- /dev/null
+++ b/plugins/kolab_2fa/localization/cs_CZ.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['remove'] = 'Odstranit';
+$labels['label'] = 'Název';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/da_DK.inc b/plugins/kolab_2fa/localization/da_DK.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/da_DK.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/de_AT.inc b/plugins/kolab_2fa/localization/de_AT.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/de_AT.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/de_CH.inc b/plugins/kolab_2fa/localization/de_CH.inc
new file mode 100644
index 00000000..92497cba
--- /dev/null
+++ b/plugins/kolab_2fa/localization/de_CH.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Erstellt';
+$labels['remove'] = 'Löschen';
+$labels['continue'] = 'Weiter';
+$labels['yes'] = 'Ja';
+$labels['no'] = 'Nein';
+$labels['label'] = 'Name';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Bestätigen';
diff --git a/plugins/kolab_2fa/localization/de_DE.inc b/plugins/kolab_2fa/localization/de_DE.inc
new file mode 100644
index 00000000..15d1c90b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/de_DE.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Erstellt';
+$labels['remove'] = 'Entfernen';
+$labels['continue'] = 'Weiter';
+$labels['yes'] = 'Ja';
+$labels['no'] = 'Nein';
+$labels['label'] = 'Name';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Bestätigen';
diff --git a/plugins/kolab_2fa/localization/el.inc b/plugins/kolab_2fa/localization/el.inc
new file mode 100644
index 00000000..53d9250d
--- /dev/null
+++ b/plugins/kolab_2fa/localization/el.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Δημιουργήθηκε';
+$labels['remove'] = 'Αφαίρεση';
+$labels['yes'] = 'ναι';
+$labels['no'] = 'όχι';
+$labels['label'] = 'Όνομα';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/el_GR.inc b/plugins/kolab_2fa/localization/el_GR.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/el_GR.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/en_GB.inc b/plugins/kolab_2fa/localization/en_GB.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/en_GB.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/en_US.inc b/plugins/kolab_2fa/localization/en_US.inc
index 9f0202b9..4865dfed 100644
--- a/plugins/kolab_2fa/localization/en_US.inc
+++ b/plugins/kolab_2fa/localization/en_US.inc
@@ -40,7 +40,7 @@ $labels['addfactor'] = 'Add Authentication Factor';
 $labels['testfactor'] = 'Test this factor';
 $labels['verifycode'] = 'Verify Code';
 $labels['verifycodeexplaintotp'] = 'Once you have scanned the QR code, enter the 6-digit verification code generated by the authenticator app.';
-$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['verifycodeexplainhotp'] = 'Once you have scanned the QR code, enter the 6-digit verification code generated by the authenticator app.';
 
 $labels['loginexpired'] = 'Login request expired! Please try again.';
 $labels['authremoveconfirm'] = 'Do you really want to remove this authentication factor from your account?';
diff --git a/plugins/kolab_2fa/localization/es_AR.inc b/plugins/kolab_2fa/localization/es_AR.inc
new file mode 100644
index 00000000..cd663d6e
--- /dev/null
+++ b/plugins/kolab_2fa/localization/es_AR.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Creado';
+$labels['remove'] = 'Elminiar';
+$labels['continue'] = 'Continuar';
+$labels['yes'] = 'si';
+$labels['no'] = 'no';
+$labels['label'] = 'Nombre';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Confirmar';
diff --git a/plugins/kolab_2fa/localization/es_ES.inc b/plugins/kolab_2fa/localization/es_ES.inc
new file mode 100644
index 00000000..5d9e0dcb
--- /dev/null
+++ b/plugins/kolab_2fa/localization/es_ES.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['remove'] = 'Borrar';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/et_EE.inc b/plugins/kolab_2fa/localization/et_EE.inc
new file mode 100644
index 00000000..6e25f34c
--- /dev/null
+++ b/plugins/kolab_2fa/localization/et_EE.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Loodud';
+$labels['remove'] = 'Eemalda';
+$labels['yes'] = 'jah';
+$labels['no'] = 'ˇei';
+$labels['label'] = 'Nimi';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/fa_IR.inc b/plugins/kolab_2fa/localization/fa_IR.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/fa_IR.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/fi_FI.inc b/plugins/kolab_2fa/localization/fi_FI.inc
new file mode 100644
index 00000000..509a3adb
--- /dev/null
+++ b/plugins/kolab_2fa/localization/fi_FI.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Luotu';
+$labels['remove'] = 'Poista';
+$labels['continue'] = 'Jatka';
+$labels['yes'] = 'kyllä';
+$labels['no'] = 'ei';
+$labels['label'] = 'Nimi';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Vahvista';
diff --git a/plugins/kolab_2fa/localization/fr_CH.inc b/plugins/kolab_2fa/localization/fr_CH.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/fr_CH.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/fr_FR.inc b/plugins/kolab_2fa/localization/fr_FR.inc
new file mode 100644
index 00000000..7c637cc6
--- /dev/null
+++ b/plugins/kolab_2fa/localization/fr_FR.inc
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Créé';
+$labels['remove'] = 'Supprimer';
+$labels['continue'] = 'Continuer';
+$labels['or'] = 'ou';
+$labels['yes'] = 'oui';
+$labels['no'] = 'non';
+$labels['label'] = 'Nom';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Confirmer';
diff --git a/plugins/kolab_2fa/localization/he_IL.inc b/plugins/kolab_2fa/localization/he_IL.inc
new file mode 100644
index 00000000..ebd378af
--- /dev/null
+++ b/plugins/kolab_2fa/localization/he_IL.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Created';
+$labels['label'] = 'Name';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/hr_HR.inc b/plugins/kolab_2fa/localization/hr_HR.inc
new file mode 100644
index 00000000..ebd378af
--- /dev/null
+++ b/plugins/kolab_2fa/localization/hr_HR.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Created';
+$labels['label'] = 'Name';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/hu.inc b/plugins/kolab_2fa/localization/hu.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/hu.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/hu_HU.inc b/plugins/kolab_2fa/localization/hu_HU.inc
new file mode 100644
index 00000000..cd12e4b4
--- /dev/null
+++ b/plugins/kolab_2fa/localization/hu_HU.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Created';
+$labels['remove'] = 'Eltávolítás';
+$labels['continue'] = 'Continue';
+$labels['yes'] = 'yes';
+$labels['no'] = 'no';
+$labels['label'] = 'Név';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Confirm';
diff --git a/plugins/kolab_2fa/localization/it_IT.inc b/plugins/kolab_2fa/localization/it_IT.inc
new file mode 100644
index 00000000..f9a6c9b2
--- /dev/null
+++ b/plugins/kolab_2fa/localization/it_IT.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Creato';
+$labels['remove'] = 'Elimina';
+$labels['continue'] = 'Continua';
+$labels['yes'] = 'sì';
+$labels['no'] = 'no';
+$labels['label'] = 'Nome';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Conferma';
diff --git a/plugins/kolab_2fa/localization/ja_JP.inc b/plugins/kolab_2fa/localization/ja_JP.inc
new file mode 100644
index 00000000..6a9e3025
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ja_JP.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = '作成済';
+$labels['remove'] = '削除';
+$labels['continue'] = '続ける';
+$labels['yes'] = 'はい';
+$labels['no'] = 'いいえ';
+$labels['label'] = '名前';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = '確認';
diff --git a/plugins/kolab_2fa/localization/ko.inc b/plugins/kolab_2fa/localization/ko.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ko.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/ko_KR.inc b/plugins/kolab_2fa/localization/ko_KR.inc
new file mode 100644
index 00000000..32e735da
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ko_KR.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = '작성됨';
+$labels['label'] = '이름';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/ku_IQ.inc b/plugins/kolab_2fa/localization/ku_IQ.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ku_IQ.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/lv.inc b/plugins/kolab_2fa/localization/lv.inc
new file mode 100644
index 00000000..aaef35a5
--- /dev/null
+++ b/plugins/kolab_2fa/localization/lv.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Izveidots';
+$labels['yes'] = 'jā';
+$labels['label'] = 'Nosaukums';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/nl_NL.inc b/plugins/kolab_2fa/localization/nl_NL.inc
new file mode 100644
index 00000000..919df62a
--- /dev/null
+++ b/plugins/kolab_2fa/localization/nl_NL.inc
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Gemaakt op';
+$labels['remove'] = 'Verwijderen';
+$labels['yes'] = 'ja';
+$labels['label'] = 'Naam';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/pl.inc b/plugins/kolab_2fa/localization/pl.inc
new file mode 100644
index 00000000..5cce5e1d
--- /dev/null
+++ b/plugins/kolab_2fa/localization/pl.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Utworzono';
+$labels['remove'] = 'Usuń';
+$labels['label'] = 'Nazwa';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/pl_PL.inc b/plugins/kolab_2fa/localization/pl_PL.inc
new file mode 100644
index 00000000..b1b5423a
--- /dev/null
+++ b/plugins/kolab_2fa/localization/pl_PL.inc
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['factor'] = 'Czynnik';
+$labels['secret'] = 'Tajny klucz ';
+$labels['created'] = 'Utworzono';
+$labels['remove'] = 'Usuń';
+$labels['continue'] = 'Kontynuuj';
+$labels['settingslist'] = 'Uwierzytelnianie wieloetapowe';
+$labels['settingstitle'] = 'Czynniki uwierzytelniania';
+$labels['totp'] = 'Aplikacja mobilna (TOTP)';
+$labels['hotp'] = 'Aplikacja mobilna (HOTP)';
+$labels['yubikey'] = 'Yubikey';
+$labels['or'] = 'lub';
+$labels['yes'] = 'tak';
+$labels['no'] = 'nie';
+$labels['label'] = 'Nazwa';
+$labels['qrcode'] = 'Kod QR';
+$labels['showqrcode'] = 'Pokaż kod QR';
+$labels['qrcodeexplaintotp'] = 'Pobierz aplikację uwierzytelniającą na swój telefon. <strong>FreeOTP</strong> i <strong>Google Authenticator</strong> są przetestowane, ale dowolna aplikacja TOTP powinna również działać.<br/><br/>
+Uruchom aplikację na swoim telefonie i zarejestruj tą usługę. Gdy aplikacja o to poprosi, zeskanuj kod QR.';
+$labels['qrcodeexplainhotp'] = 'Pobierz aplikację uwierzytelniającą na swój telefon. <strong>Google Authenticator</strong> jest znana z poprawnej pracy, ale dowolna aplikacja HOTP powinna również działać.<br/><br/>
+Uruchom aplikację na swoim telefonie i zarejestruj tą usługę. Gdy aplikacja o to poprosi, zeskanuj kod QR.';
+$labels['yubikeyid'] = 'Twój identyfikator Yubikey';
+$labels['yubikeyidexplainyubikey'] = 'Naciśnij swojego Yubikeya i wprowadź wygenerowany kod';
+$labels['addfactor'] = 'Dodaj czynnik uwierzytelniający';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Potwierdź';
diff --git a/plugins/kolab_2fa/localization/pt_BR.inc b/plugins/kolab_2fa/localization/pt_BR.inc
new file mode 100644
index 00000000..44ad114e
--- /dev/null
+++ b/plugins/kolab_2fa/localization/pt_BR.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Criado';
+$labels['remove'] = 'Remover';
+$labels['continue'] = 'Continuar';
+$labels['yes'] = 'sim';
+$labels['no'] = 'não';
+$labels['label'] = 'Nome';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Confirmar';
diff --git a/plugins/kolab_2fa/localization/pt_PT.inc b/plugins/kolab_2fa/localization/pt_PT.inc
new file mode 100644
index 00000000..239ad97f
--- /dev/null
+++ b/plugins/kolab_2fa/localization/pt_PT.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Criado em';
+$labels['label'] = 'Nome';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/ro.inc b/plugins/kolab_2fa/localization/ro.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ro.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/ru_RU.inc b/plugins/kolab_2fa/localization/ru_RU.inc
new file mode 100644
index 00000000..dc21af44
--- /dev/null
+++ b/plugins/kolab_2fa/localization/ru_RU.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Создана';
+$labels['remove'] = 'Убрать';
+$labels['continue'] = 'Продолжить';
+$labels['yes'] = 'да';
+$labels['no'] = 'нет';
+$labels['label'] = 'Имя';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Подтвердить';
diff --git a/plugins/kolab_2fa/localization/sk_SK.inc b/plugins/kolab_2fa/localization/sk_SK.inc
new file mode 100644
index 00000000..4016978b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/sk_SK.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['label'] = 'Meno';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/sl_SI.inc b/plugins/kolab_2fa/localization/sl_SI.inc
new file mode 100644
index 00000000..dc311237
--- /dev/null
+++ b/plugins/kolab_2fa/localization/sl_SI.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Ustvarjeno';
+$labels['remove'] = 'Odstrani';
+$labels['label'] = 'Ime';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/sr_RS.inc b/plugins/kolab_2fa/localization/sr_RS.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/sr_RS.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/sv_SE.inc b/plugins/kolab_2fa/localization/sv_SE.inc
new file mode 100644
index 00000000..9a00c9fd
--- /dev/null
+++ b/plugins/kolab_2fa/localization/sv_SE.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Skapad';
+$labels['remove'] = 'Ta bort';
+$labels['continue'] = 'Fortsätt';
+$labels['yes'] = 'ja';
+$labels['no'] = 'nej';
+$labels['label'] = 'Namn';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['enterhighsecurity'] = 'Bekräfta';
diff --git a/plugins/kolab_2fa/localization/th_TH.inc b/plugins/kolab_2fa/localization/th_TH.inc
new file mode 100644
index 00000000..74e3c24b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/th_TH.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'สร้างเมื่อ';
+$labels['remove'] = 'ลบ';
+$labels['yes'] = 'ตกลง';
+$labels['no'] = 'ไม่';
+$labels['label'] = 'ชื่อ';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/tr.inc b/plugins/kolab_2fa/localization/tr.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/tr.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/tr_TR.inc b/plugins/kolab_2fa/localization/tr_TR.inc
new file mode 100644
index 00000000..848da87b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/tr_TR.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/uk_UA.inc b/plugins/kolab_2fa/localization/uk_UA.inc
new file mode 100644
index 00000000..9ddab695
--- /dev/null
+++ b/plugins/kolab_2fa/localization/uk_UA.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Створена';
+$labels['label'] = 'Назва';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/vi_VN.inc b/plugins/kolab_2fa/localization/vi_VN.inc
new file mode 100644
index 00000000..ebd378af
--- /dev/null
+++ b/plugins/kolab_2fa/localization/vi_VN.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Created';
+$labels['label'] = 'Name';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/zh_CN.inc b/plugins/kolab_2fa/localization/zh_CN.inc
new file mode 100644
index 00000000..dd4db92b
--- /dev/null
+++ b/plugins/kolab_2fa/localization/zh_CN.inc
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = '已创建';
+$labels['yes'] = '是';
+$labels['no'] = '否';
+$labels['label'] = '名称';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/localization/zh_TW.inc b/plugins/kolab_2fa/localization/zh_TW.inc
new file mode 100644
index 00000000..ebd378af
--- /dev/null
+++ b/plugins/kolab_2fa/localization/zh_TW.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab 2-Factor-Auth plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
+ */
+$labels['created'] = 'Created';
+$labels['label'] = 'Name';
+$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
diff --git a/plugins/kolab_2fa/skins/elastic/templates/config.html b/plugins/kolab_2fa/skins/elastic/templates/config.html
new file mode 100644
index 00000000..6b76b8fc
--- /dev/null
+++ b/plugins/kolab_2fa/skins/elastic/templates/config.html
@@ -0,0 +1,25 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_2fa.settingstitle" /></h1>
+
+<div class="content selected no-navbar" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"><roundcube:label name="kolab_2fa.settingstitle" /></span>
+		<div class="toolbar"></div>
+	</div>
+	<div class="scroller frame-content">
+		<p class="addfactor">
+			<roundcube:object name="plugin.factoradder" class="form-control" />
+		</p>
+		<roundcube:object name="plugin.settingslist" class="authentication-factors" />
+	</div>
+</div>
+
+<roundcube:object name="plugin.settingsform" class="propform" />
+<roundcube:object name="plugin.highsecuritydialog" class="kolab2fa-highsecuritydialog hidden" />
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_activesync/composer.json b/plugins/kolab_activesync/composer.json
index ba5c7880..ee564408 100644
--- a/plugins/kolab_activesync/composer.json
+++ b/plugins/kolab_activesync/composer.json
@@ -4,7 +4,7 @@
     "description": "ActiveSync configuration utility for Kolab accounts",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -26,6 +26,6 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_activesync/kolab_activesync.js b/plugins/kolab_activesync/kolab_activesync.js
index 7146a804..26a56ac9 100644
--- a/plugins/kolab_activesync/kolab_activesync.js
+++ b/plugins/kolab_activesync/kolab_activesync.js
@@ -35,7 +35,15 @@ function kolab_activesync_config()
   if (rcmail.gui_objects.devicelist) {
     var devicelist = new rcube_list_widget(rcmail.gui_objects.devicelist,
       { multiselect:true, draggable:false, keyboard:true });
-    devicelist.addEventListener('select', select_device).init().focus();
+
+    devicelist.addEventListener('select', select_device)
+      .init()
+      .focus();
+
+    rcmail.devicelist = devicelist;
+    setTimeout(function() {
+      rcmail.triggerEvent('listupdate', {list: devicelist, rowcount: devicelist.rowcount});
+    }, 100);
 
     // load frame if there are no devices
     if (!rcmail.env.devicecount)
@@ -56,7 +64,7 @@ function kolab_activesync_config()
     });
 
     var fn = function(elem) {
-      var classname = elem.className,
+      var classname = elem.className.split(' ')[0],
         list = $(elem).closest('table').find('input.' + classname),
         check = list.not(':checked').length > 0;
 
@@ -72,7 +80,9 @@ function kolab_activesync_config()
   {
     active_device = list.get_single_selection();
 
-    if (active_device)
+    rcmail.enable_command('plugin.delete-device', list.get_selection().length > 0);
+
+    if (active_device && !list.multi_selecting)
       device_select(active_device);
     else if (rcmail.env.contentframe)
       rcmail.show_contentframe(false);
@@ -139,16 +149,25 @@ function kolab_activesync_config()
     if (p.success && p.id && p['delete']) {
       active_device = null;
       device_select();
-      devicelist.remove_row(p.id);
+
+      if (p.id == 'ALL')
+        devicelist.clear();
+      else
+        devicelist.remove_row(p.id);
+
+      rcmail.triggerEvent('listupdate', {list: devicelist, rowcount: devicelist.rowcount});
       rcmail.enable_command('plugin.delete-device', false);
     }
   };
+
   // handler for delete commands
   function delete_device_config()
   {
-    if (active_device && confirm(rcmail.gettext('devicedeleteconfirm', 'kolab_activesync'))) {
+    var selection = devicelist.get_selection();
+
+    if (selection.length && confirm(rcmail.gettext('devicedeleteconfirm', 'kolab_activesync'))) {
       http_lock = rcmail.set_busy(true, 'kolab_activesync.savingdata');
-      rcmail.http_post('plugin.activesync-json', { cmd:'delete', id:active_device }, http_lock);
+      rcmail.http_post('plugin.activesync-json', { cmd:'delete', id:selection }, http_lock);
     }
   };
 
diff --git a/plugins/kolab_activesync/kolab_activesync.php b/plugins/kolab_activesync/kolab_activesync.php
index 80c1052e..235ab5aa 100644
--- a/plugins/kolab_activesync/kolab_activesync.php
+++ b/plugins/kolab_activesync/kolab_activesync.php
@@ -109,7 +109,7 @@ class kolab_activesync extends rcube_plugin
 
         if ($content = $this->ui->folder_options_table($mbox_imap, $devices, $type)) {
             $args['form']['activesync'] = array(
-                'name'    => rcube::Q($this->gettext('tabtitle')),
+                'name'    => $this->gettext('tabtitle'),
                 'content' => $content,
             );
         }
@@ -159,12 +159,17 @@ class kolab_activesync extends rcube_plugin
             break;
 
         case 'delete':
-            $success = $this->device_delete($imei);
+            foreach ((array) $imei as $id) {
+                $success = $this->device_delete($id);
+            }
 
             if ($success) {
                 $this->rc->output->show_message($this->gettext('successfullydeleted'), 'confirmation');
                 $this->rc->output->command('plugin.activesync_save_complete', array(
-                    'success' => true, 'id' => $imei, 'delete' => true));
+                        'success' => true,
+                        'delete'  => true,
+                        'id'      => count($imei) > 1 ? 'ALL' : $imei[0],
+                ));
             }
             else
                 $this->rc->output->show_message($this->gettext('savingerror'), 'error');
diff --git a/plugins/kolab_activesync/kolab_activesync_ui.php b/plugins/kolab_activesync/kolab_activesync_ui.php
index 5200e4af..acd66506 100644
--- a/plugins/kolab_activesync/kolab_activesync_ui.php
+++ b/plugins/kolab_activesync/kolab_activesync_ui.php
@@ -52,7 +52,8 @@ class kolab_activesync_ui
         foreach ($devices as $id => $device) {
             $name = $device['ALIAS'] ? $device['ALIAS'] : $id;
             $table->add_row(array('id' => 'rcmrow' . $id));
-            $table->add(null, html::span('devicealias', rcube::Q($name)) . html::span('devicetype', rcube::Q($device['TYPE'])));
+            $table->add(null, html::span('devicealias', rcube::Q($name))
+                . ' ' . html::span('devicetype secondary', rcube::Q($device['TYPE'])));
         }
 
         $this->rc->output->add_gui_object('devicelist', $attrib['id']);
@@ -79,7 +80,7 @@ class kolab_activesync_ui
         if (!empty($info)) {
             foreach ($info as $key => $value) {
                 if ($value) {
-                    $table->add('title', rcube::Q($this->plugin->gettext($key)));
+                    $table->add('title', html::label(null, rcube::Q($this->plugin->gettext($key))));
                     $table->add(null, rcube::Q($value));
                 }
             }
@@ -95,12 +96,14 @@ class kolab_activesync_ui
 
     public function folder_subscriptions($attrib = array())
     {
-        if (!$attrib['id'])
+        if (!$attrib['id']) {
             $attrib['id'] = 'foldersubscriptions';
+        }
 
         // group folders by type (show only known types)
         $folder_groups = array('mail' => array(), 'contact' => array(), 'event' => array(), 'task' => array(), 'note' => array());
         $folder_types  = kolab_storage::folders_typedata();
+        $use_fieldsets = rcube_utils::get_boolean($attrib['use-fieldsets']);
         $imei          = $this->device['_id'];
         $subscribed    = array();
 
@@ -132,10 +135,17 @@ class kolab_activesync_ui
             if (empty($group)) {
                 continue;
             }
+
             $attrib['type'] = $type;
-            $html .= html::div('subscriptionblock',
-                html::tag('h3', $type, $this->plugin->gettext($type)) .
-                $this->folder_subscriptions_block($group, $attrib, $subscribed));
+            $table = $this->folder_subscriptions_block($group, $attrib, $subscribed);
+            $label = $this->plugin->gettext($type);
+
+            if ($use_fieldsets) {
+                $html .= html::tag('fieldset', 'subscriptionblock', html::tag('legend', $type, $label) . $table);
+            }
+            else {
+                $html .= html::div('subscriptionblock', html::tag('h3', $type, $label) . $table);
+            }
         }
 
         $this->rc->output->add_gui_object('subscriptionslist', $attrib['id']);
@@ -147,15 +157,27 @@ class kolab_activesync_ui
     {
         $alarms = ($attrib['type'] == 'event' || $attrib['type'] == 'task');
 
-        $table = new html_table(array('cellspacing' => 0));
-        $table->add_header(array('class' => 'subscription', 'title' => $this->plugin->gettext('synchronize'), 'tabindex' => 0),
+        $table = new html_table(array('cellspacing' => 0, 'class' => 'table-striped'));
+        $table->add_header(array(
+                'class'    => 'subscription checkbox-cell',
+                'title'    => $this->plugin->gettext('synchronize'),
+                'tabindex' => 0
+            ),
             $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'])) :
-                $this->plugin->gettext('synchronize'));
+                $this->plugin->gettext('synchronize')
+        );
+
         if ($alarms) {
-            $table->add_header(array('class' => 'alarm', 'title' => $this->plugin->gettext('withalarms'), 'tabindex' => 0),
+            $table->add_header(array(
+                    'class'    => 'alarm checkbox-cell',
+                    'title'    => $this->plugin->gettext('withalarms'),
+                    'tabindex' => 0
+                ),
                 $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'])) :
-                    $this->plugin->gettext('withalarms'));
+                    $this->plugin->gettext('withalarms')
+            );
         }
+
         $table->add_header('foldername', $this->plugin->gettext('folder'));
 
         $checkbox_sync  = new html_checkbox(array('name' => 'subscribed[]', 'class' => 'subscription'));
@@ -163,7 +185,7 @@ class kolab_activesync_ui
 
         $names = array();
         foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_name($folder));
+            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_prettyname($folder));
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
             for ($i = count($names)-1; $i >= 0; $i--) {
@@ -186,12 +208,12 @@ class kolab_activesync_ui
             }
 
             $table->add_row();
-            $table->add('subscription', $checkbox_sync->show(
+            $table->add('subscription checkbox-cell', $checkbox_sync->show(
                 !empty($subscribed[$folder]) ? $folder : null,
                 array('value' => $folder, 'id' => $folder_id)));
 
             if ($alarms) {
-                $table->add('alarm', $checkbox_alarm->show(
+                $table->add('alarm checkbox-cell', $checkbox_alarm->show(
                     intval($subscribed[$folder]) > 1 ? $folder : null,
                     array('value' => $folder, 'id' => $folder_id.'_alarm')));
             }
@@ -236,13 +258,13 @@ class kolab_activesync_ui
 
             $table->add_row();
             $table->add(array('class' => 'device', 'title' => $title), $name);
-            $table->add('subscription', $checkbox->show(!empty($folder_data[$id]['S']) ? 1 : 0));
+            $table->add('subscription checkbox-cell', $checkbox->show(!empty($folder_data[$id]['S']) ? 1 : 0));
 
             if ($alarms) {
                 $checkbox_alarm = new html_checkbox(array('name' => "_alarms[$id]", 'value' => 1,
                     'onchange' => 'return activesync_object.update_sync_data(this)'));
 
-                $table->add('alarm', $checkbox_alarm->show($folder_data[$id]['S'] > 1 ? 1 : 0));
+                $table->add('alarm checkbox-cell', $checkbox_alarm->show($folder_data[$id]['S'] > 1 ? 1 : 0));
             }
         }
 
diff --git a/plugins/kolab_activesync/localization/bg.inc b/plugins/kolab_activesync/localization/bg.inc
new file mode 100644
index 00000000..698c94a7
--- /dev/null
+++ b/plugins/kolab_activesync/localization/bg.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['task'] = 'Задачи';
+?>
diff --git a/plugins/kolab_activesync/localization/bg_BG.inc b/plugins/kolab_activesync/localization/bg_BG.inc
index 59c2a6b5..b355f6ac 100644
--- a/plugins/kolab_activesync/localization/bg_BG.inc
+++ b/plugins/kolab_activesync/localization/bg_BG.inc
@@ -7,7 +7,7 @@ $labels['withalarms'] = 'С аларми';
 $labels['syncsettings'] = 'Настройки на синхронизация';
 $labels['folderstosync'] = 'Папки за синхронизиране';
 $labels['mail'] = 'Електронна поща';
-$labels['contact'] = 'Адресни книги';
+$labels['contact'] = 'Контакти';
 $labels['event'] = 'Календари';
 $labels['task'] = 'Задачи';
 $labels['note'] = 'Бележки';
diff --git a/plugins/kolab_activesync/localization/ca_ES.inc b/plugins/kolab_activesync/localization/ca_ES.inc
index 90e3c356..a4b9c4cf 100644
--- a/plugins/kolab_activesync/localization/ca_ES.inc
+++ b/plugins/kolab_activesync/localization/ca_ES.inc
@@ -1,4 +1,5 @@
 <?php
+$labels['contact'] = 'Contacts';
 $labels['event'] = 'Calendaris';
 $labels['task'] = 'Tasques';
 $labels['savingdata'] = 'S\'estan desant les dades...';
diff --git a/plugins/kolab_activesync/localization/cs_CZ.inc b/plugins/kolab_activesync/localization/cs_CZ.inc
index 41b26dd4..d925c9c0 100644
--- a/plugins/kolab_activesync/localization/cs_CZ.inc
+++ b/plugins/kolab_activesync/localization/cs_CZ.inc
@@ -1,27 +1,33 @@
 <?php
 $labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Správa zařízení Avtivesync';
 $labels['devices'] = 'Zařízení';
 $labels['devicealias'] = 'Název zařízení';
 $labels['synchronize'] = 'Synchronizovat';
+$labels['withalarms'] = 'Připomenutí';
 $labels['syncsettings'] = 'Nastavení synchronizace';
-$labels['deviceconfig'] = 'Konfigurace zařízení';
+$labels['deviceconfig'] = 'Nastavení zařízení';
 $labels['folderstosync'] = 'Složky k synchronizaci';
 $labels['mail'] = 'E-mail';
-$labels['contact'] = 'Adresáře';
+$labels['contact'] = 'Spojení';
 $labels['event'] = 'Kalendáře';
 $labels['task'] = 'Úkoly';
 $labels['note'] = 'Poznámky';
 $labels['configuration'] = 'Nastavení';
 $labels['deletedevice'] = 'Smazat zařízení';
-$labels['savingdata'] = 'Ukládám data...';
-$labels['savingerror'] = 'Nepodařilo se uložit konfiguraci';
-$labels['devicedeleteconfirm'] = 'Opravdu chcete smazat konfiguraci pro toto zařízení?';
-$labels['successfullydeleted'] = 'Konfigurace zařízení byla úspěšně odebrána';
-$labels['devicenotfound'] = 'Nelze přečíst konfigurace zařízení';
+$labels['nodevices'] = 'V současné době nemáte registrována žádná zařízení.<br/><br/>Zařízení musíte nejprve připojit k serveru dle <a href="$url" target="_blank">těchto pokynů</a>. Po úspěšném připojení zde bude dostupné nastavení připojených zařízení.';
+$labels['savingdata'] = 'Ukládají se data...';
+$labels['savingerror'] = 'Nepodařilo se uložit nastavení';
+$labels['notsupported'] = 'Váš server nepodporuje popisná data/poznámky';
+$labels['devicedeleteconfirm'] = 'Opravdu chcete smazat nastavení pro toto zařízení?';
+$labels['successfullydeleted'] = 'Nastavení zařízení bylo úspěšně odebráno';
+$labels['devicenotfound'] = 'Nelze přečíst nastavení zařízení';
 $labels['devicetype'] = 'Typ zařízení';
 $labels['acsversion'] = 'Verze protokolu';
+$labels['useragent'] = 'Uživatelský agent';
 $labels['friendlyname'] = 'Zobrazovaný název';
 $labels['os'] = 'Operační systém';
-$labels['oslanguage'] = 'Jazyk OS';
+$labels['oslanguage'] = 'Jazyk operačního systému';
 $labels['phonenumber'] = 'Telefonní číslo';
+$labels['arialabeldeviceframe'] = 'Nastavení synchronizace zařízení';
 ?>
diff --git a/plugins/kolab_activesync/localization/da_DK.inc b/plugins/kolab_activesync/localization/da_DK.inc
index edbde446..7760d7ef 100644
--- a/plugins/kolab_activesync/localization/da_DK.inc
+++ b/plugins/kolab_activesync/localization/da_DK.inc
@@ -9,7 +9,7 @@ $labels['syncsettings'] = 'Indstillinger for synkronisering';
 $labels['deviceconfig'] = 'Konfiguration af enhed';
 $labels['folderstosync'] = 'Mapper som skal synkroniseres';
 $labels['mail'] = 'E-post';
-$labels['contact'] = 'Adressebøger';
+$labels['contact'] = 'Kontakter';
 $labels['event'] = 'Kalendere';
 $labels['task'] = 'Opgaver';
 $labels['note'] = 'Noter';
diff --git a/plugins/kolab_activesync/localization/de_CH.inc b/plugins/kolab_activesync/localization/de_CH.inc
index a456e906..af0c9d70 100644
--- a/plugins/kolab_activesync/localization/de_CH.inc
+++ b/plugins/kolab_activesync/localization/de_CH.inc
@@ -1,10 +1,12 @@
 <?php
 $labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Verwalte ActiveSync-Geräte';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
 $labels['synchronize'] = 'Synchronisieren';
 $labels['withalarms'] = 'Mit Erinnerungen';
 $labels['syncsettings'] = 'Synchronisationseinstellungen';
+$labels['deviceconfig'] = 'Gerätekonfiguration';
 $labels['folderstosync'] = 'Order zum Synchronisieren';
 $labels['mail'] = 'E-Mail';
 $labels['contact'] = 'Kontakte';
@@ -13,10 +15,19 @@ $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
 $labels['configuration'] = 'Konfiguration';
 $labels['deletedevice'] = 'Gerät löschen';
+$labels['nodevices'] = 'Es sind aktuell keine Geräte registriert.<br/><br/>Um ein Gerät zu registrieren, bitte zuerst nach der Anleitung von <a href="$url" target="_blank">dieser Seite</a> mit dem Server verbinden. Anschließend sollte das Gerät für die Konfiguration hier zur Verfügung stehen.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-$labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden';
+$labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden.';
+$labels['devicetype'] = 'Gerätetyp';
+$labels['acsversion'] = 'Protokollversion';
+$labels['useragent'] = 'User Agent';
+$labels['friendlyname'] = 'Lesbarer Name';
+$labels['os'] = 'Betriebssystem';
+$labels['oslanguage'] = 'Betriebssystemsprache';
+$labels['phonenumber'] = 'Telefonnummer';
+$labels['arialabeldeviceframe'] = 'Formular für die Einstellungen zur Gerätesynchronisation';
 ?>
diff --git a/plugins/kolab_activesync/localization/de_DE.inc b/plugins/kolab_activesync/localization/de_DE.inc
index 0d41a693..4e422a00 100644
--- a/plugins/kolab_activesync/localization/de_DE.inc
+++ b/plugins/kolab_activesync/localization/de_DE.inc
@@ -1,13 +1,13 @@
 <?php
-$labels['tabtitle'] = 'Activesync';
-$labels['activesynctitle'] = 'Verwalte Activesync-Geräte';
+$labels['tabtitle'] = 'ActiveSync';
+$labels['activesynctitle'] = 'Verwalte ActiveSync-Geräte';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
 $labels['synchronize'] = 'Synchronisieren';
 $labels['withalarms'] = 'Mit Erinnerungen';
 $labels['syncsettings'] = 'Synchronisationseinstellungen';
 $labels['deviceconfig'] = 'Gerätekonfiguration';
-$labels['folderstosync'] = 'Order zum Synchronisieren';
+$labels['folderstosync'] = 'Ordner zum Synchronisieren';
 $labels['mail'] = 'E-Mail';
 $labels['contact'] = 'Kontakte';
 $labels['event'] = 'Kalender';
@@ -15,8 +15,9 @@ $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
 $labels['configuration'] = 'Konfiguration';
 $labels['deletedevice'] = 'Gerät löschen';
+$labels['nodevices'] = 'Es sind aktuell keine Geräte registriert.<br/><br/>Um ein Gerät zu registrieren, bitte zuerst nach der Anleitung von <a href="$url" target="_blank">dieser Seite</a> mit dem Server verbinden. Anschließend sollte das Gerät für die Konfiguration hier zur Verfügung stehen.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['savingerror'] = 'Fehler beim Speichern';
+$labels['savingerror'] = 'Fehler beim Speichern der Konfiguration';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
diff --git a/plugins/kolab_activesync/localization/el.inc b/plugins/kolab_activesync/localization/el.inc
new file mode 100644
index 00000000..0f3b92b5
--- /dev/null
+++ b/plugins/kolab_activesync/localization/el.inc
@@ -0,0 +1,30 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Διαχείριση συσκευών Activesync';
+$labels['devices'] = 'Συσκευές';
+$labels['devicealias'] = 'Όνομα συσκευής';
+$labels['synchronize'] = 'Συγχρονισμός';
+$labels['withalarms'] = 'Με ξυπνητήρια';
+$labels['syncsettings'] = 'Ρυθμίσεις συγχρονισμού';
+$labels['deviceconfig'] = 'Ρυθμίσεις συσκευής';
+$labels['folderstosync'] = 'Φάκελοι προς συγχρονισμό';
+$labels['mail'] = 'Ηλεκτρονική αλληλογραφία';
+$labels['contact'] = 'Επαφές';
+$labels['event'] = 'Ημερολόγια';
+$labels['task'] = 'Εργασίες';
+$labels['note'] = 'Σημειώσεις';
+$labels['configuration'] = 'Ρυθμίσεις';
+$labels['deletedevice'] = 'Διαγραφή συσκευής';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+$labels['savingerror'] = 'Αποτυχία αποθήκευσης ρυθμίσεων';
+$labels['devicedeleteconfirm'] = 'Θέλετε να διαγράψετε τις ρυθμίσεις για αυτή τη συσκευή;';
+$labels['successfullydeleted'] = 'Αφαιρέθηκε επιτυχώς οι ρυθμίσεις για την συσκευή';
+$labels['devicenotfound'] = 'Αδυναμία ανάγνωσης ρυθμίσεων συσκευής';
+$labels['devicetype'] = 'Τύπος συσκευής';
+$labels['acsversion'] = 'Έκδοση πρωτοκόλλου';
+$labels['friendlyname'] = 'Φιλικό όνομα';
+$labels['os'] = 'Λειτουργικό σύστημα';
+$labels['oslanguage'] = 'Γλώσσα λειτουργικού συστήματος';
+$labels['phonenumber'] = 'Αριθμός τηλεφώνου';
+$labels['arialabeldeviceframe'] = 'Ρυθμίσεις συγχρονισμού συσκευής από';
+?>
diff --git a/plugins/kolab_activesync/localization/en_US.inc b/plugins/kolab_activesync/localization/en_US.inc
index 683488f4..01d6f47f 100644
--- a/plugins/kolab_activesync/localization/en_US.inc
+++ b/plugins/kolab_activesync/localization/en_US.inc
@@ -10,7 +10,7 @@ $labels['syncsettings'] = 'Synchronization settings';
 $labels['deviceconfig'] = 'Device configuration';
 $labels['folderstosync'] = 'Folders to synchronize';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
+$labels['contact'] = 'Contacts';
 $labels['event'] = 'Calendars';
 $labels['task'] = 'Tasks';
 $labels['note'] = 'Notes';
diff --git a/plugins/kolab_activesync/localization/es_AR.inc b/plugins/kolab_activesync/localization/es_AR.inc
index b15840c0..b9ed4fc5 100644
--- a/plugins/kolab_activesync/localization/es_AR.inc
+++ b/plugins/kolab_activesync/localization/es_AR.inc
@@ -9,12 +9,13 @@ $labels['syncsettings'] = 'Configuración de sincronización';
 $labels['deviceconfig'] = 'Configuración de dispositivo';
 $labels['folderstosync'] = 'Carpetas a sincronizar';
 $labels['mail'] = 'Correo Electrónico';
-$labels['contact'] = 'Libreta de direcciones';
+$labels['contact'] = 'Contactos';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
 $labels['configuration'] = 'Configuración';
 $labels['deletedevice'] = 'Eliminar dispositivo';
+$labels['nodevices'] = 'En este momento no hay dispositivos registrados.<br/><br/>Para registrar un dispositivo, por favor conéctelo primero al servidor, usando las instrucciones de <a href="$url" target="_blank">esta página</a>. Posteriormente el dispositivo debería estar disponible para su configuración aquí.';
 $labels['savingdata'] = 'Guardando...';
 $labels['savingerror'] = 'Fallo al guardar la configuración';
 $labels['notsupported'] = 'Su servidor no soporta metadatos/anotaciones';
diff --git a/plugins/kolab_activesync/localization/es_ES.inc b/plugins/kolab_activesync/localization/es_ES.inc
index ae64b4d2..d07ec1c4 100644
--- a/plugins/kolab_activesync/localization/es_ES.inc
+++ b/plugins/kolab_activesync/localization/es_ES.inc
@@ -1,9 +1,33 @@
 <?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Administrar dispositivos ActiveSync';
+$labels['devices'] = 'Dispositivos';
+$labels['devicealias'] = 'Nombre del dispositivo';
+$labels['synchronize'] = 'Sincronizar';
+$labels['withalarms'] = 'Con alarmas';
+$labels['syncsettings'] = 'Ajustes de sincronización';
+$labels['deviceconfig'] = 'Configuración del dispositivo';
+$labels['folderstosync'] = 'Carpetas para sincronizar';
 $labels['mail'] = 'Correo electrónico';
-$labels['contact'] = 'Libreta de direcciones';
+$labels['contact'] = 'Contactos';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
 $labels['configuration'] = 'Configuración';
+$labels['deletedevice'] = 'Borrar dispositivo';
+$labels['nodevices'] = 'Actualmente no hay dispositivos registrados. <br/> <br/> Para registrar un dispositivo, primero conéctelo al servidor usando las instrucciones de <a href="$url" target="_blank"> esta página < / A>. A continuación, el dispositivo debe estar disponible para la configuración aquí.';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['savingerror'] = 'Error al guardar la configuración';
+$labels['notsupported'] = 'Su servidor no admite metadatos/anotaciones';
+$labels['devicedeleteconfirm'] = '¿Esta seguro de eliminar la configuración de este dispositivo?';
+$labels['successfullydeleted'] = 'La configuración del dispositivo se ha eliminado con éxito';
+$labels['devicenotfound'] = 'No puede leerse la configuración del dispositivo';
+$labels['devicetype'] = 'Tipo de dispositivo';
+$labels['acsversion'] = 'Versión del protocolo';
+$labels['useragent'] = 'Agente de usuario';
+$labels['friendlyname'] = 'Nombre amigable';
+$labels['os'] = 'Sistema operativo';
+$labels['oslanguage'] = 'Idioma del SI';
+$labels['phonenumber'] = 'Número de teléfono';
+$labels['arialabeldeviceframe'] = 'Formulario de configuración de sincronización de dispositivos';
 ?>
diff --git a/plugins/kolab_activesync/localization/et_EE.inc b/plugins/kolab_activesync/localization/et_EE.inc
index 421ee327..3dca9c63 100644
--- a/plugins/kolab_activesync/localization/et_EE.inc
+++ b/plugins/kolab_activesync/localization/et_EE.inc
@@ -1,3 +1,20 @@
 <?php
+$labels['devices'] = 'Seadmed';
+$labels['devicealias'] = 'Seadme nimi';
+$labels['synchronize'] = 'Sünkrooni';
+$labels['deviceconfig'] = 'Seadme häälestamine';
+$labels['folderstosync'] = 'Sünkroonitavad kaustad';
 $labels['mail'] = 'E-post';
+$labels['contact'] = 'Kontaktid';
+$labels['event'] = 'Kalendrid';
+$labels['task'] = 'Ülesanded';
+$labels['note'] = 'Märkmed';
+$labels['configuration'] = 'Seadistamine';
+$labels['deletedevice'] = 'Kustuta seade';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['devicetype'] = 'Seadme liik';
+$labels['friendlyname'] = 'Inimsõbralik nimi';
+$labels['os'] = 'Operatsioonisüsteem';
+$labels['oslanguage'] = 'OS-i keel';
+$labels['phonenumber'] = 'Telefoninumber';
 ?>
diff --git a/plugins/kolab_activesync/localization/fi_FI.inc b/plugins/kolab_activesync/localization/fi_FI.inc
index b32944a2..b92b2b89 100644
--- a/plugins/kolab_activesync/localization/fi_FI.inc
+++ b/plugins/kolab_activesync/localization/fi_FI.inc
@@ -9,7 +9,7 @@ $labels['syncsettings'] = 'Synkronointiasetukset';
 $labels['deviceconfig'] = 'Laitteen määritykset';
 $labels['folderstosync'] = 'Synkronoitavat kansiot';
 $labels['mail'] = 'Sähköposti';
-$labels['contact'] = 'Osoitekirjat';
+$labels['contact'] = 'Yhteystiedot';
 $labels['event'] = 'Kalenterit';
 $labels['task'] = 'Tehtävät';
 $labels['note'] = 'Muistiot';
diff --git a/plugins/kolab_activesync/localization/fr_FR.inc b/plugins/kolab_activesync/localization/fr_FR.inc
index 1a8715c2..576c3755 100644
--- a/plugins/kolab_activesync/localization/fr_FR.inc
+++ b/plugins/kolab_activesync/localization/fr_FR.inc
@@ -2,22 +2,23 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['activesynctitle'] = 'Gestion des périphériques Activesync';
 $labels['devices'] = 'Périphériques';
-$labels['devicealias'] = 'Nom du Périphérique';
+$labels['devicealias'] = 'Nom du périphérique';
 $labels['synchronize'] = 'Synchroniser';
 $labels['withalarms'] = 'Avec alarmes';
 $labels['syncsettings'] = 'Paramètres de synchronisation';
-$labels['deviceconfig'] = 'Configuration du péripherique';
+$labels['deviceconfig'] = 'Configuration du périphérique';
 $labels['folderstosync'] = 'Dossiers à synchroniser';
 $labels['mail'] = 'Adresse de messagerie';
-$labels['contact'] = 'Carnet d\'adresses';
-$labels['event'] = 'Agendas';
+$labels['contact'] = 'Contacts';
+$labels['event'] = 'Calendriers';
 $labels['task'] = 'Tâches';
 $labels['note'] = 'Notes';
 $labels['configuration'] = 'Configuration';
 $labels['deletedevice'] = 'Supprimer ce périphérique';
+$labels['nodevices'] = 'Il n\'y a actuellement pas de périphérique enregistré.<br/><br/>Afin d\'enregistrer un périphérique, commencez par le connecter au serveur. Pour ce faire, utilisez les instructions de <a href="http://wiki.kolab.org/Setup_ActiveSync">cette page</a>. Ensuite, le périphérique devrait devenir disponible pour configuration ici.';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['savingerror'] = 'Échec de l\'enregistrement de la configuration';
-$labels['notsupported'] = 'Votre serveur ne supporte pas les métadonnées ou les annotations';
+$labels['notsupported'] = 'Votre serveur ne supporte pas les métadonnées ni les annotations';
 $labels['devicedeleteconfirm'] = 'Voulez-vous vraiment supprimer la configuration de ce périphérique?';
 $labels['successfullydeleted'] = 'La configuration de ce périphérique a été supprimée';
 $labels['devicenotfound'] = 'Impossible de lire la configuration du périphérique';
diff --git a/plugins/kolab_activesync/localization/hr_HR.inc b/plugins/kolab_activesync/localization/hr_HR.inc
new file mode 100644
index 00000000..0ef333fc
--- /dev/null
+++ b/plugins/kolab_activesync/localization/hr_HR.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['event'] = 'Kalendari';
+?>
diff --git a/plugins/kolab_activesync/localization/hu_HU.inc b/plugins/kolab_activesync/localization/hu_HU.inc
index a2ac48a8..40f09d4f 100644
--- a/plugins/kolab_activesync/localization/hu_HU.inc
+++ b/plugins/kolab_activesync/localization/hu_HU.inc
@@ -9,7 +9,7 @@ $labels['syncsettings'] = 'Szinkronizációs beállítások';
 $labels['deviceconfig'] = 'Készülék jellemzői';
 $labels['folderstosync'] = 'Szinkronizálandó mappák';
 $labels['mail'] = 'E-mail';
-$labels['contact'] = 'Címjegyzékek';
+$labels['contact'] = 'Kapcsolatok';
 $labels['event'] = 'Naptárak';
 $labels['task'] = 'Feladatok';
 $labels['note'] = 'Jegyzetek';
diff --git a/plugins/kolab_activesync/localization/it_IT.inc b/plugins/kolab_activesync/localization/it_IT.inc
index 02e550a4..b0a1a175 100644
--- a/plugins/kolab_activesync/localization/it_IT.inc
+++ b/plugins/kolab_activesync/localization/it_IT.inc
@@ -9,7 +9,7 @@ $labels['syncsettings'] = 'Impostazioni sincronizzazione';
 $labels['deviceconfig'] = 'Configurazione del dispositivo';
 $labels['folderstosync'] = 'Cartelle da sincronizzare';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Rubriche';
+$labels['contact'] = 'Contatti';
 $labels['event'] = 'Calendari';
 $labels['task'] = 'Attività';
 $labels['note'] = 'Annotazioni';
diff --git a/plugins/kolab_activesync/localization/ja_JP.inc b/plugins/kolab_activesync/localization/ja_JP.inc
index 450da2d8..db628869 100644
--- a/plugins/kolab_activesync/localization/ja_JP.inc
+++ b/plugins/kolab_activesync/localization/ja_JP.inc
@@ -1,22 +1,33 @@
 <?php
 $labels['tabtitle'] = 'アクティブシンク';
+$labels['activesynctitle'] = 'アクティブシンクデバイス管理';
 $labels['devices'] = '機器';
 $labels['devicealias'] = '機器名';
 $labels['synchronize'] = '同期';
 $labels['withalarms'] = 'アラーム付';
 $labels['syncsettings'] = '同期設定';
+$labels['deviceconfig'] = 'デバイス設定';
 $labels['folderstosync'] = '同期するフォルダ';
-$labels['contact'] = 'アドレス帳';
+$labels['mail'] = 'Eメール';
+$labels['contact'] = 'コンタクト';
 $labels['event'] = 'カレンダー';
 $labels['task'] = 'タスク';
 $labels['note'] = 'ノート';
 $labels['configuration'] = '設定';
 $labels['deletedevice'] = '機器の削除';
+$labels['nodevices'] = '現在どのデバイスも登録されてません。<br/><br/>デバイスを登録するには、まずデバイスをサーバへ接続してください、そして<a href="$url" target="_blank">このページ</a>の説明に従ってください。その後、ここでデバイスが設定できるようになります。';
 $labels['savingdata'] = 'データを保存中…';
 $labels['savingerror'] = '設定の保存に失敗しました';
 $labels['notsupported'] = 'サーバはmetadata/annotionsをサポートしていません';
 $labels['devicedeleteconfirm'] = '本当にこのデバイスの設定を削除しますか？';
 $labels['successfullydeleted'] = 'デヴァイスの削除に成功しました';
 $labels['devicenotfound'] = 'デヴァイスの設定を読込めません';
+$labels['devicetype'] = 'デバイスタイプ';
+$labels['acsversion'] = 'プロトコルバージョン';
+$labels['useragent'] = 'ユーザエージェント';
+$labels['friendlyname'] = '表示名';
+$labels['os'] = 'OS';
+$labels['oslanguage'] = 'OS言語';
 $labels['phonenumber'] = '電話番号';
+$labels['arialabeldeviceframe'] = 'デバイス同期設定元';
 ?>
diff --git a/plugins/kolab_activesync/localization/ko_KR.inc b/plugins/kolab_activesync/localization/ko_KR.inc
new file mode 100644
index 00000000..ebe5c634
--- /dev/null
+++ b/plugins/kolab_activesync/localization/ko_KR.inc
@@ -0,0 +1,4 @@
+<?php
+$labels['event'] = '캘린더';
+$labels['savingdata'] = '자료 저장중...';
+?>
diff --git a/plugins/kolab_activesync/localization/lv.inc b/plugins/kolab_activesync/localization/lv.inc
new file mode 100644
index 00000000..861e31c0
--- /dev/null
+++ b/plugins/kolab_activesync/localization/lv.inc
@@ -0,0 +1,6 @@
+<?php
+$labels['devices'] = 'Ierīces';
+$labels['mail'] = 'E-pasts';
+$labels['event'] = 'Kalendāri';
+$labels['savingdata'] = 'Saglabājam...';
+?>
diff --git a/plugins/kolab_activesync/localization/nl_NL.inc b/plugins/kolab_activesync/localization/nl_NL.inc
index 7685fd1b..80dc962c 100644
--- a/plugins/kolab_activesync/localization/nl_NL.inc
+++ b/plugins/kolab_activesync/localization/nl_NL.inc
@@ -1,31 +1,33 @@
 <?php
 $labels['tabtitle'] = 'Activesync';
-$labels['activesynctitle'] = 'Beheer Activesync-apparaten';
+$labels['activesynctitle'] = 'Activesync-apparaten beheren';
 $labels['devices'] = 'Apparaten';
-$labels['devicealias'] = 'Apparaat naam';
-$labels['synchronize'] = 'Synchronizeren';
-$labels['withalarms'] = 'Met alarmen';
-$labels['syncsettings'] = 'Synchronizatie instellingen';
-$labels['deviceconfig'] = 'Apparaat configuratie';
-$labels['folderstosync'] = 'Mappen voor synchronisatie';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Adresboeken';
-$labels['event'] = 'Kalenders';
+$labels['devicealias'] = 'Apparaatnaam';
+$labels['synchronize'] = 'Synchroniseren';
+$labels['withalarms'] = 'Met herinneringen';
+$labels['syncsettings'] = 'Synchronisatie-instellingen';
+$labels['deviceconfig'] = 'Configuratie van apparaat';
+$labels['folderstosync'] = 'Te synchroniseren mappen';
+$labels['mail'] = 'E-mail';
+$labels['contact'] = 'Contactpersonen';
+$labels['event'] = 'Agenda\'s';
 $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['configuration'] = 'Configuratie';
-$labels['deletedevice'] = 'Verwijder apparaat';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['savingerror'] = 'Fout in opslaan van configuratie';
-$labels['notsupported'] = 'Uw server ondersteunt geen metadata/annotaties';
-$labels['devicedeleteconfirm'] = 'Wilt u de configuratie voor dit apparaat echt verwijderen?';
-$labels['successfullydeleted'] = 'Het apparaat is succesvol verwijderd';
-$labels['devicenotfound'] = 'Lezen van apparaat configuratie mislukt';
-$labels['devicetype'] = 'Apparaat type';
-$labels['acsversion'] = 'Protocol versie';
-$labels['useragent'] = 'User agent';
-$labels['friendlyname'] = 'Weergave naam';
+$labels['deletedevice'] = 'Apparaat verwijderen';
+$labels['nodevices'] = 'Momenteel zijn er geen apparaten geregistreerd.<br/><br/>Als u een apparaat wilt registreren, volgt u de instructies op <a href="$url" target="_blank">deze pagina</a> om het eerst met de server te verbinden. Daarna kunt u het apparaat hier configureren.';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['savingerror'] = 'Opslaan van configuratie is mislukt';
+$labels['notsupported'] = 'Uw server ondersteunt geen metagegevens/annotaties';
+$labels['devicedeleteconfirm'] = 'Weet u zeker dat u de configuratie voor dit apparaat wilt verwijderen?';
+$labels['successfullydeleted'] = 'De configuratie van het apparaat is met succes verwijderd';
+$labels['devicenotfound'] = 'Configuratie van apparaat kan niet worden gelezen';
+$labels['devicetype'] = 'Apparaattype';
+$labels['acsversion'] = 'Protocolversie';
+$labels['useragent'] = 'Gebruikersagent';
+$labels['friendlyname'] = 'Beschrijvende naam';
 $labels['os'] = 'Besturingssysteem';
-$labels['oslanguage'] = 'Taal besturingssysteem';
+$labels['oslanguage'] = 'Taal van besturingssysteem';
 $labels['phonenumber'] = 'Telefoonnummer';
+$labels['arialabeldeviceframe'] = 'Formulier met instellingen voor synchronisatie van apparaat';
 ?>
diff --git a/plugins/kolab_activesync/localization/pl_PL.inc b/plugins/kolab_activesync/localization/pl_PL.inc
index 327c73de..279b7944 100644
--- a/plugins/kolab_activesync/localization/pl_PL.inc
+++ b/plugins/kolab_activesync/localization/pl_PL.inc
@@ -1,33 +1,5 @@
 <?php
-$labels['tabtitle'] = 'ActiveSync';
-$labels['activesynctitle'] = 'Zarządzaj urządzeniami ActiveSync';
-$labels['devices'] = 'Urządzenia';
-$labels['devicealias'] = 'Nazwa urządzenia';
-$labels['synchronize'] = 'Synchronizuj';
-$labels['withalarms'] = 'Z alarmami';
-$labels['syncsettings'] = 'Ustawienia synchronizacji';
-$labels['deviceconfig'] = 'Konfiguracja urządzenia';
-$labels['folderstosync'] = 'Foldery do synchronizacji';
-$labels['mail'] = 'Poczta';
-$labels['contact'] = 'Książki adresowe';
 $labels['event'] = 'Kalendarze';
 $labels['task'] = 'Zadania';
-$labels['note'] = 'Notatki';
-$labels['configuration'] = 'Konfiguracja';
-$labels['deletedevice'] = 'Usuń urządzenie';
-$labels['nodevices'] = 'Obecnie nie masz zarejestrowanych urządzeń.<br/><br/>Aby zarejestrować urządzenie należy je podłączyć do serwera według <a href="http://wiki.kolab.org/Setup_ActiveSync">instrukcji</a>. Następnie będzie można konfigurować to urządzenie tutaj.';
 $labels['savingdata'] = 'Zapisuję dane...';
-$labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
-$labels['notsupported'] = 'Twój serwer nie obsługuje rozszerzenia metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację tego urządzenia?';
-$labels['successfullydeleted'] = 'Konfiguracja urządzenie została usunięta';
-$labels['devicenotfound'] = 'Nie można odczytać konfiguracji urządzenia';
-$labels['devicetype'] = 'Typ urządzenia';
-$labels['acsversion'] = 'Wersja protokołu';
-$labels['useragent'] = 'Klient';
-$labels['friendlyname'] = 'Przyjazna nazwa';
-$labels['os'] = 'System operacyjny';
-$labels['oslanguage'] = 'Język systemu';
-$labels['phonenumber'] = 'Numer telefonu';
-$labels['arialabeldeviceframe'] = 'Formularz ustawień synchronizacji urządzenia';
 ?>
diff --git a/plugins/kolab_activesync/localization/pt_BR.inc b/plugins/kolab_activesync/localization/pt_BR.inc
index 57927957..951508f8 100644
--- a/plugins/kolab_activesync/localization/pt_BR.inc
+++ b/plugins/kolab_activesync/localization/pt_BR.inc
@@ -7,7 +7,7 @@ $labels['withalarms'] = 'Com alarmes';
 $labels['syncsettings'] = 'Sincronizar configurações';
 $labels['folderstosync'] = 'Pastas para sincronizar';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Catálogo de Endereços';
+$labels['contact'] = 'Contatos';
 $labels['event'] = 'Calendários';
 $labels['task'] = 'Tarefas';
 $labels['note'] = 'Notas';
diff --git a/plugins/kolab_activesync/localization/pt_PT.inc b/plugins/kolab_activesync/localization/pt_PT.inc
index e37f1e47..d603a33f 100644
--- a/plugins/kolab_activesync/localization/pt_PT.inc
+++ b/plugins/kolab_activesync/localization/pt_PT.inc
@@ -1,4 +1,19 @@
 <?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Gerir dispositivos Activesync';
+$labels['devices'] = 'Dispostivos';
+$labels['devicealias'] = 'Nome do Dispositivo';
+$labels['synchronize'] = 'Sincronizar';
+$labels['withalarms'] = 'Com alarme';
+$labels['syncsettings'] = 'Definições de sincronização';
+$labels['deviceconfig'] = 'Configuração de dispositivo';
+$labels['folderstosync'] = 'Pastas a sincronizar';
+$labels['mail'] = 'Email';
 $labels['event'] = 'Calendários';
-$labels['savingdata'] = 'Salvando dados...';
+$labels['task'] = 'Tarefas';
+$labels['note'] = 'Notas';
+$labels['configuration'] = 'Configuração';
+$labels['deletedevice'] = 'Remover dispositivo';
+$labels['savingdata'] = 'A guardar os dados...';
+$labels['savingerror'] = 'Falha ao guardar as alterações.';
 ?>
diff --git a/plugins/kolab_activesync/localization/ru_RU.inc b/plugins/kolab_activesync/localization/ru_RU.inc
index 943fc690..b5a916bd 100644
--- a/plugins/kolab_activesync/localization/ru_RU.inc
+++ b/plugins/kolab_activesync/localization/ru_RU.inc
@@ -9,7 +9,7 @@ $labels['syncsettings'] = 'Настройки синхронизации';
 $labels['deviceconfig'] = 'Конфигурация устройства';
 $labels['folderstosync'] = 'Каталоги для синхронизации';
 $labels['mail'] = 'Почта';
-$labels['contact'] = 'Адресные книги';
+$labels['contact'] = 'Контакты';
 $labels['event'] = 'Календари';
 $labels['task'] = 'Задачи';
 $labels['note'] = 'Заметки';
diff --git a/plugins/kolab_activesync/localization/sk_SK.inc b/plugins/kolab_activesync/localization/sk_SK.inc
new file mode 100644
index 00000000..2b5fc11c
--- /dev/null
+++ b/plugins/kolab_activesync/localization/sk_SK.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['event'] = 'Kalendáre';
+?>
diff --git a/plugins/kolab_activesync/localization/sl_SI.inc b/plugins/kolab_activesync/localization/sl_SI.inc
new file mode 100644
index 00000000..5f298833
--- /dev/null
+++ b/plugins/kolab_activesync/localization/sl_SI.inc
@@ -0,0 +1,9 @@
+<?php
+$labels['mail'] = 'Email';
+$labels['contact'] = 'Kontakti';
+$labels['event'] = 'Koledarji';
+$labels['task'] = 'Naloge';
+$labels['note'] = 'Zapiski';
+$labels['configuration'] = 'Nastavitve';
+$labels['savingdata'] = 'Shranjujem...';
+?>
diff --git a/plugins/kolab_activesync/localization/sv_SE.inc b/plugins/kolab_activesync/localization/sv_SE.inc
index 9e4c5713..777bfac8 100644
--- a/plugins/kolab_activesync/localization/sv_SE.inc
+++ b/plugins/kolab_activesync/localization/sv_SE.inc
@@ -1,33 +1,8 @@
 <?php
-$labels['tabtitle'] = 'Activesync';
-$labels['activesynctitle'] = 'Hantera Activesync-enheter';
-$labels['devices'] = 'Enheter';
-$labels['devicealias'] = 'Enhetsnamn';
-$labels['synchronize'] = 'Synkronisera';
-$labels['withalarms'] = 'Med alarm';
-$labels['syncsettings'] = 'Synkronisera inställningar';
-$labels['deviceconfig'] = 'Enhetskonfiguration';
-$labels['folderstosync'] = 'Mappar att synkronisera';
-$labels['mail'] = 'E-post';
-$labels['contact'] = 'Adressböcker';
+$labels['contact'] = 'Kontakter';
 $labels['event'] = 'Kalendrar';
 $labels['task'] = 'Uppgifter';
 $labels['note'] = 'Anteckningar';
 $labels['configuration'] = 'Konfiguration';
-$labels['deletedevice'] = 'Ta bort enhet';
-$labels['nodevices'] = 'Det finns för närvarande inga enheter registrerade.<br/><br/>För att registrera en enhet, anslut den till servern först, enligt <a href="http://wiki.kolab.org/Setup_ActiveSync">instruktionerna i wikin </a>. Efteråt bör enheten bli tillgänglig för konfiguration här.';
 $labels['savingdata'] = 'Sparar data ...';
-$labels['savingerror'] = 'Misslyckades att spara konfiguration';
-$labels['notsupported'] = 'Din server stöder inte metadata/annoteringar';
-$labels['devicedeleteconfirm'] = 'Vill du verkligen ta bort konfigurationen för denna enhet?';
-$labels['successfullydeleted'] = 'Enhetskonfigurationen togs bort';
-$labels['devicenotfound'] = 'Kan inte läsa enhetskonfiguration';
-$labels['devicetype'] = 'Enhetstyp';
-$labels['acsversion'] = 'Protokollversion';
-$labels['useragent'] = 'Användaragent';
-$labels['friendlyname'] = 'Enkelt namn';
-$labels['os'] = 'Operativsystem';
-$labels['oslanguage'] = 'OS-språk';
-$labels['phonenumber'] = 'Telefonnummer';
-$labels['arialabeldeviceframe'] = 'Inställningsformulär för enhetssynkronisering';
 ?>
diff --git a/plugins/kolab_activesync/localization/th_TH.inc b/plugins/kolab_activesync/localization/th_TH.inc
new file mode 100644
index 00000000..df88c45f
--- /dev/null
+++ b/plugins/kolab_activesync/localization/th_TH.inc
@@ -0,0 +1,30 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'จัดการอุปกรณ์ที่ใช้ Activesync';
+$labels['devices'] = 'อุปกรณ์';
+$labels['devicealias'] = 'ชื่ออุปกรณ์';
+$labels['synchronize'] = 'ปรับปรุงให้สอดคล้องกัน';
+$labels['syncsettings'] = 'การตั้งค่าการปรับปรุงให้สอดคล้องกัน';
+$labels['deviceconfig'] = 'การตั้งค่าอุปกรณ์';
+$labels['folderstosync'] = 'แฟ้มที่ต้องการปรับปรุง';
+$labels['mail'] = 'อีเมล์';
+$labels['contact'] = 'รายชื้อผู้ติดต่อ';
+$labels['event'] = 'ปฎิทิน';
+$labels['task'] = 'งาน';
+$labels['note'] = 'สมุดจด';
+$labels['configuration'] = 'ค่าคุณสมบัติ';
+$labels['deletedevice'] = 'ลบอุปกรณ์';
+$labels['savingdata'] = 'บันทึกข้อมูล';
+$labels['savingerror'] = 'การบันทึกค่าคุณสมบัติล้มเหลว';
+$labels['notsupported'] = 'เซิฟเวอร์ของคุณไม่รองรับ metadata/annotations';
+$labels['devicedeleteconfirm'] = 'คุณต้องการลบค่าคุณสมบัติของอุปกรณ์นี้หรือ';
+$labels['successfullydeleted'] = 'ค่าคุณสมบัติของอุปกรณ์นี้ได้ถูกลบเรียบร้อยแล้ว';
+$labels['devicenotfound'] = 'ไม่สามารถอ่านค่าคุณสมบัติของอุปกรณ์ได้';
+$labels['devicetype'] = 'ชนิดของอุปกรณ์';
+$labels['acsversion'] = 'โปรโตคอล รุ่นที่';
+$labels['friendlyname'] = 'ชื่อที่เรียกง่าย';
+$labels['os'] = 'ระบบปฎิบัติการ';
+$labels['oslanguage'] = 'ภาษาของระบบปฎิบัติการ';
+$labels['phonenumber'] = 'หมายเลขโทรศัพท์';
+$labels['arialabeldeviceframe'] = 'ฟอร์มการตั้งค่าการปรับปรุงให้สอดคล้องของอุปกรณ์';
+?>
diff --git a/plugins/kolab_activesync/localization/uk_UA.inc b/plugins/kolab_activesync/localization/uk_UA.inc
new file mode 100644
index 00000000..50c40bf7
--- /dev/null
+++ b/plugins/kolab_activesync/localization/uk_UA.inc
@@ -0,0 +1,7 @@
+<?php
+$labels['mail'] = 'Пошта';
+$labels['event'] = 'Календарі';
+$labels['task'] = 'Задачі';
+$labels['note'] = 'Нотатки';
+$labels['savingdata'] = 'Збереження даних...';
+?>
diff --git a/plugins/kolab_activesync/localization/zh_CN.inc b/plugins/kolab_activesync/localization/zh_CN.inc
index 8333353e..27f2b011 100644
--- a/plugins/kolab_activesync/localization/zh_CN.inc
+++ b/plugins/kolab_activesync/localization/zh_CN.inc
@@ -1,4 +1,7 @@
 <?php
+$labels['activesynctitle'] = '管理Activesync设备';
+$labels['devices'] = '设备';
+$labels['mail'] = '邮件';
 $labels['note'] = '笔记';
 $labels['savingdata'] = '保存数据...';
 ?>
diff --git a/plugins/kolab_activesync/localization/zh_TW.inc b/plugins/kolab_activesync/localization/zh_TW.inc
new file mode 100644
index 00000000..27eb832f
--- /dev/null
+++ b/plugins/kolab_activesync/localization/zh_TW.inc
@@ -0,0 +1,4 @@
+<?php
+$labels['event'] = 'Calendars';
+$labels['savingdata'] = 'Saving data...';
+?>
diff --git a/plugins/kolab_activesync/skins/classic/alarm-clock.png b/plugins/kolab_activesync/skins/classic/alarm-clock.png
deleted file mode 100755
index 518bdc11..00000000
Binary files a/plugins/kolab_activesync/skins/classic/alarm-clock.png and /dev/null differ
diff --git a/plugins/kolab_activesync/skins/classic/config.css b/plugins/kolab_activesync/skins/classic/config.css
deleted file mode 100644
index cc4b0dbe..00000000
--- a/plugins/kolab_activesync/skins/classic/config.css
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Stylesheets for the Kolab ActiveSync configuration UI */
-
-#devices-table {
-	width: 100%;
-	table-layout: fixed;
-	cursor: default;
-}
-
-#devices-table td span.devicetype {
-	padding-left: 1em;
-	font-style: italic;
-	color: #666;
-}
-
-#devices-table tr.selected td span.devicetype {
-	color: #ccc;
-}
-
-.boxfooter a.button.delete,
-.boxfooter a.buttonPas.delete {
-	background-image: url(deviceactions.png);
-}
-
-div.subscriptionblock {
-	float: left;
-	margin: 0.5em 3em 2em 0;
-	padding: 0;
-	border: 1px solid #ddd;
-}
-
-div.subscriptionblock h3 {
-	font-size: 12px;
-	color: #333;
-	margin: 0 0 0.4em 0;
-	padding: 4px 4px 0 30px;
-	background: url(foldertypes.png) 5px 4px no-repeat #eee;
-}
-
-div.subscriptionblock h3.contact {
-	background-position: 5px -16px;
-}
-
-div.subscriptionblock h3.event {
-	background-position: 5px -36px;
-}
-
-div.subscriptionblock h3.task {
-	background-position: 5px -56px;
-}
-
-div.subscriptionblock h3.note {
-	background-position: 5px -76px;
-}
-
-#foldersubscriptions thead th {
-	color: #999;
-	font-weight: bold;
-	padding: 2px;
-	text-align: center;
-}
-
-#foldersubscriptions thead tr th {
-	border-top: 1px solid #ddd;
-}
-
-#foldersubscriptions thead th {
-	cursor: pointer;
-}
-
-#foldersubscriptions thead th.foldername {
-    text-align: left;
-}
-
-#foldersubscriptions tbody td {
-	padding: 1px 2px;
-	border-top: 1px solid #ddd;
-	background-color: white;
-}
-
-#foldersubscriptions td label {
-	display: block;
-}
-
-#foldersubscriptions td.mailbox {
-	min-width: 12em;
-	padding-right: 10px;
-}
-
-#foldersubscriptions td.virtual {
-	color: #999;
-}
-
-#foldersubscriptions {
-	overflow: auto;
-	margin-top: 0.5em;
-}
-
-#introtext {
-	position: absolute;
-	top: 12px;
-	left: 5px;
-	padding-left: 10px;
-	max-width: 40em;
-}
-
-#introtext .pointer-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 14px;
-	height: 100%;
-	background: url(pointer-left.gif) right center no-repeat;
-}
-
-#introtext .inner {
-	border: 3px solid #e7e7e7;
-	background: #fff;
-}
-
-#introtext .bordered {
-	padding: 12px;
-	border: 1px solid #ccc;
-	background: #fff;
-}
diff --git a/plugins/kolab_activesync/skins/classic/deviceactions.png b/plugins/kolab_activesync/skins/classic/deviceactions.png
deleted file mode 100644
index a542df91..00000000
Binary files a/plugins/kolab_activesync/skins/classic/deviceactions.png and /dev/null differ
diff --git a/plugins/kolab_activesync/skins/classic/foldertypes.png b/plugins/kolab_activesync/skins/classic/foldertypes.png
deleted file mode 100644
index 4950296a..00000000
Binary files a/plugins/kolab_activesync/skins/classic/foldertypes.png and /dev/null differ
diff --git a/plugins/kolab_activesync/skins/classic/pointer-left.gif b/plugins/kolab_activesync/skins/classic/pointer-left.gif
deleted file mode 100644
index b2de5850..00000000
Binary files a/plugins/kolab_activesync/skins/classic/pointer-left.gif and /dev/null differ
diff --git a/plugins/kolab_activesync/skins/classic/synchronize.png b/plugins/kolab_activesync/skins/classic/synchronize.png
deleted file mode 100755
index ba5ebd1f..00000000
Binary files a/plugins/kolab_activesync/skins/classic/synchronize.png and /dev/null differ
diff --git a/plugins/kolab_activesync/skins/classic/templates/config.html b/plugins/kolab_activesync/skins/classic/templates/config.html
deleted file mode 100644
index 5d2bd5e2..00000000
--- a/plugins/kolab_activesync/skins/classic/templates/config.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="sectionslist">
-	<div id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_activesync.devices" /></div>
-	<div class="boxlistcontent">
-		<roundcube:object name="plugin.devicelist" id="devices-table" class="records-table" cellspacing="0" />
-	</div>
-	<div class="boxfooter">
-		<roundcube:button type="link" command="plugin.delete-device" title="kolab_activesync.deletedevice" class="buttonPas delete" classAct="button delete" content=" " />
-	</div>
-</div>
-
-<script type="text/javascript">
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195 });
-	rcmail.add_onload('viewsplit.init()');
-</script>
-
-<div id="prefs-box">
-	<roundcube:frame contentframe="activesync-frame" id="activesync-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
-</div>
-
-</div>
-
-</body>
-</html>
diff --git a/plugins/kolab_activesync/skins/classic/templates/configedit.html b/plugins/kolab_activesync/skins/classic/templates/configedit.html
deleted file mode 100644
index 8115ef6f..00000000
--- a/plugins/kolab_activesync/skins/classic/templates/configedit.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="iframe">
-
-<div id="prefs-title" class="boxtitle"><roundcube:label name="kolab_activesync.syncsettings"></div>
-
-<div id="prefs-details" class="boxcontent">
-	<form action="#" method="post" id="configform">
-		<fieldset>
-			<legend><roundcube:label name="kolab_activesync.deviceconfig" /></legend>
-			<roundcube:object name="plugin.deviceconfigform" form="configform" class="propform" />
-		</fieldset>
-		<fieldset>
-			<legend><roundcube:label name="kolab_activesync.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
-		</fieldset>
-	</form>
-	<div id="formfooter">
-		<div class="footerleft">
-			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
-		</div>
-	</div>
-</div>
-
-</body>
-</html>
diff --git a/plugins/kolab_activesync/skins/classic/templates/configempty.html b/plugins/kolab_activesync/skins/classic/templates/configempty.html
deleted file mode 100644
index e36fc174..00000000
--- a/plugins/kolab_activesync/skins/classic/templates/configempty.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="iframe">
-
-<div id="preferences-details" class="boxcontent">
-	<div id="introtext">
-		<div class="inner">
-			<roundcube:object name="initmessage" />
-		</div>
-		<div class="pointer-left"></div>
-	</div>
-</div>
-
-</body>
-</html>
diff --git a/plugins/kolab_activesync/skins/elastic/templates/config.html b/plugins/kolab_activesync/skins/elastic/templates/config.html
new file mode 100644
index 00000000..00983278
--- /dev/null
+++ b/plugins/kolab_activesync/skins/elastic/templates/config.html
@@ -0,0 +1,38 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_activesync.tabtitle" /></h1>
+
+<!-- devices list -->
+<div class="list listbox selected" aria-labelledby="aria-label-deviceslist">
+	<div class="header">
+		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
+		<span id="aria-label-deviceslist" class="header-title"><roundcube:label name="kolab_activesync.devices" /></span>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="plugin.devicelist" id="devices-table" class="listing"
+			data-label-msg="listempty" role="listbox" data-list="devicelist" />
+	</div>
+</div>
+
+<!-- device info frame -->
+<div class="content" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div class="toolbar">
+			<roundcube:button command="plugin.delete-device" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_activesync.deletedevice" innerclass="inner" />
+		</div>
+	</div>
+	<div class="iframe-wrapper">
+		<roundcube:frame contentframe="activesync-frame" id="activesync-frame" src="/watermark.html" title="arialabeldeviceframe" />
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_activesync/skins/elastic/templates/configedit.html b/plugins/kolab_activesync/skins/elastic/templates/configedit.html
new file mode 100644
index 00000000..a1f1284e
--- /dev/null
+++ b/plugins/kolab_activesync/skins/elastic/templates/configedit.html
@@ -0,0 +1,23 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_activesync.syncsettings" /></h1>
+
+<div class="formcontent">
+	<form action="#" method="post" id="configform" class="propform">
+		<fieldset>
+			<legend><roundcube:label name="kolab_activesync.deviceconfig" /></legend>
+			<roundcube:object name="plugin.deviceconfigform" form="configform" class="propform" />
+		</fieldset>
+		<fieldset>
+			<legend><roundcube:label name="kolab_activesync.folderstosync" /></legend>
+			<roundcube:object name="plugin.foldersubscriptions" form="configform"
+				id="foldersubscriptions" use-fieldsets="true" class="tabbed" />
+		</fieldset>
+	</form>
+</div>
+
+<div class="formbuttons">
+	<roundcube:button command="plugin.save-config" class="btn btn-primary submit" label="save" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_activesync/skins/elastic/templates/configempty.html b/plugins/kolab_activesync/skins/elastic/templates/configempty.html
new file mode 100644
index 00000000..047b1074
--- /dev/null
+++ b/plugins/kolab_activesync/skins/elastic/templates/configempty.html
@@ -0,0 +1,11 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_activesync.syncsettings" /></h1>
+
+<div class="formcontent">
+	<div class="boxinformation">
+		<roundcube:object name="initmessage" />
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_addressbook/composer.json b/plugins/kolab_addressbook/composer.json
index 4b8b0250..b533033d 100644
--- a/plugins/kolab_addressbook/composer.json
+++ b/plugins/kolab_addressbook/composer.json
@@ -4,7 +4,7 @@
     "description": "Kolab addressbook",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -26,6 +26,6 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ar/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ar/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..c831a3ad
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/ar/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/bg_BG/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/bg_BG/LC_MESSAGES/addressbook.po
index 18279f36..2e2ec523 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/bg_BG/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/bg_BG/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ca_ES/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ca_ES/LC_MESSAGES/addressbook.po
index 762e4831..6fb4cd3f 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/ca_ES/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/ca_ES/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/cs_CZ/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/cs_CZ/LC_MESSAGES/addressbook.po
index 5ec6d9bc..7ed06164 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/cs_CZ/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/cs_CZ/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/da_DK/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/da_DK/LC_MESSAGES/addressbook.po
index f44c9ebb..da6dc09f 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/da_DK/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/da_DK/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/de_CH/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/de_CH/LC_MESSAGES/addressbook.po
index 57c213da..4e7e9496 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/de_CH/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/de_CH/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po
index 97c186ca..82aa3a21 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Mads <mads@batmads.com>, 2016
+# Max Hellwig <max.hellwig@translating-energy.de>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:17+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Mads <mads@batmads.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +28,7 @@ msgstr "Adressbücher teilen"
 msgid ""
 "Just like calendars or regular email folders, personal address books can "
 "also be shared with other users in your workgroup."
-msgstr ""
+msgstr "Persönliche Adressbücher können genauso wie Kalender oder normale E-Mail-Ordner mit anderen Nutzern Ihrer Arbeitsgruppe geteilt werden. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
 msgid "Share Contacts with others"
@@ -37,7 +39,7 @@ msgid ""
 "Settings for sharing is controlled through the address book properties "
 "accessible through the *More actions* menu behind the gear icon the footer "
 "in the :ref:`addressbook-groups` list."
-msgstr ""
+msgstr "Die Einstellungen zum Teilen werden über die Eigenschaften des Adressbuchs gemacht, die durch das *Weitere Tätigkeiten*-Menü hinter dem Zahnradicon in der Fußzeile der :ref: `Adressbuchgruppen <addressbook-groups>`-Liste zu erreichen sind. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
 msgid "Select the address book you want to share."
@@ -45,22 +47,22 @@ msgstr "Wählen Sie das Adressbuch aus, dass Sie teilen möchten."
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
 msgid "Choose *Edit address book* from the actions menu."
-msgstr ""
+msgstr "Wählen Sie *Adressbuch bearbeiten* aus dem Tätigkeitenmenü. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
 msgid "Switch to the *Sharing* tab in the properties form on the right."
-msgstr ""
+msgstr "Wechseln Sie auf den *Teilen*-Reiter in der Eigenschaftenmaske rechts. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
 msgid ""
 "The table displays who already has permission to see and modify the selected"
 " address book. Here you can manage permissions the same way as :ref:`Sharing"
 " a Folder <settings-folder-sharing>`."
-msgstr ""
+msgstr "Die Tabelle zeigt an, wer schon die Erlaubnis hat, das ausgewählte Adressbuch zu sehen und verändern. Freigaben können hier auf die selbe Weise, wie :ref: `Ordner teilen <settings-folder-sharing>` verwaltet werden. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
 msgid "Subscribe to Shared Address Books"
-msgstr ""
+msgstr "Geteilte Adressbücher abonnieren"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
 msgid ""
@@ -69,11 +71,11 @@ msgid ""
 "<settings-folders>` to see all resources you can access. There's a shortcut "
 "to this: click *Manage folders* in the actions menu behind the gear icon "
 "located the footer of the directory list."
-msgstr ""
+msgstr "Adressbücher, die von anderen geteilt wurden, werden nicht sofort in der Verzeichnisliste des Webclients angezeigt. Wechseln Sie zu :ref: `Einstellungen > Ordner <settings-folders>`, um alle Hilfsmittel, auf die Sie Zugriff haben, zu sehen. Es gibt einen schnelleren Weg dorthin: Klicken Sie auf *Ordner verwalten* im Tätigkeitenmenü hinter dem Zahnradicon in der Fußzeile der Verzeichnisliste. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
 msgid ""
 "In order to make a shared address book appear in the address book view, "
 "locate it in the folder manager and check the *Subscribed* mark in the list."
 " Only subscribed directories are visible in the address book view."
-msgstr ""
+msgstr "Um ein geteiltes Adressbuch in der Adressbuchansicht anzuzeigen, wählen Sie es in der Ordnerverwaltung aus und setzen Sie bei *Abonniert* ein Häkchen in der Liste. Nur abonnierte Verzeichnisse sind in der Adressbuchansicht sichtbar. "
diff --git a/plugins/kolab_addressbook/helpdocs/locale/el/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/el/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..6ec03c51
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/el/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/en_RO/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/en_RO/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..530de4f6
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/en_RO/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/en_US/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/en_US/LC_MESSAGES/addressbook.po
index e081200d..904f2131 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/en_US/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/en_US/LC_MESSAGES/addressbook.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/es_AR/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/es_AR/LC_MESSAGES/addressbook.po
index e76aa004..38a303b9 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/es_AR/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/es_AR/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/es_ES/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/es_ES/LC_MESSAGES/addressbook.po
index f51bdda7..d17a68f4 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/es_ES/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/es_ES/LC_MESSAGES/addressbook.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,13 +20,13 @@ msgstr ""
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
-msgstr ""
+msgstr "Compartir libreta de direcciones"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
 msgid ""
 "Just like calendars or regular email folders, personal address books can "
 "also be shared with other users in your workgroup."
-msgstr ""
+msgstr "Al igual que los calendarios o las carpetas de correo electrónico normales, las libretas de direcciones personales también pueden compartirse con otros usuarios de su grupo de trabajo."
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
 msgid "Share Contacts with others"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/et_EE/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/et_EE/LC_MESSAGES/addressbook.po
index bd4b8b9b..02456a96 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/et_EE/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/et_EE/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/fi_FI/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/fi_FI/LC_MESSAGES/addressbook.po
index feb5e302..a4e309db 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/fi_FI/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/fi_FI/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/fr_CH/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/fr_CH/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..5649bf57
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/fr_CH/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/fr_FR/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/fr_FR/LC_MESSAGES/addressbook.po
index a37de950..712f2ef0 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/fr_FR/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/fr_FR/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/he/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/he/LC_MESSAGES/addressbook.po
index aee618c5..0f693518 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/he/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/he/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/hr/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/hr/LC_MESSAGES/addressbook.po
index 4b2c91a9..06717b04 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/hr/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/hr/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/hu_HU/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/hu_HU/LC_MESSAGES/addressbook.po
index 26be81f6..85cb8d37 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/hu_HU/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/hu_HU/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/it_IT/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/it_IT/LC_MESSAGES/addressbook.po
index 59f0cf0b..698b9f83 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/it_IT/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/it_IT/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ja_JP/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ja_JP/LC_MESSAGES/addressbook.po
index bab3cedf..17ad4512 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/ja_JP/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/ja_JP/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ko/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ko/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..5352be1b
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/ko/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ko_KR/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ko_KR/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..fbca6b1a
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/ko_KR/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ku_IQ/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ku_IQ/LC_MESSAGES/addressbook.po
index 570df02b..03deb40c 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/ku_IQ/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/ku_IQ/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/lv/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/lv/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..826c68c2
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/lv/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/nl_NL/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/nl_NL/LC_MESSAGES/addressbook.po
index 9ad9f0ca..4550dead 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/nl_NL/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/nl_NL/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/pl_PL/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/pl_PL/LC_MESSAGES/addressbook.po
index 6f626b79..08b737a6 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/pl_PL/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/pl_PL/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/pt_BR/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/pt_BR/LC_MESSAGES/addressbook.po
index 03fa47cd..16c989f8 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/pt_BR/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/pt_BR/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/pt_PT/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/pt_PT/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..9389c612
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/pt_PT/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ro/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ro/LC_MESSAGES/addressbook.po
index 453956f3..63199709 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/ro/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/ro/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/ru_RU/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/ru_RU/LC_MESSAGES/addressbook.po
index fa0132e4..6b34afa1 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/ru_RU/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/ru_RU/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/sk/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/sk/LC_MESSAGES/addressbook.po
index 233baf3d..97ad4422 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/sk/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/sk/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/sl_SI/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/sl_SI/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..63953706
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/sl_SI/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/sv/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/sv/LC_MESSAGES/addressbook.po
index bef467d9..d5bed340 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/sv/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/sv/LC_MESSAGES/addressbook.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:08+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/th_TH/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/th_TH/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..5b66075b
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/th_TH/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/tr/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/tr/LC_MESSAGES/addressbook.po
new file mode 100644
index 00000000..262d5e62
--- /dev/null
+++ b/plugins/kolab_addressbook/helpdocs/locale/tr/LC_MESSAGES/addressbook.po
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
+msgid "Sharing Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
+msgid ""
+"Just like calendars or regular email folders, personal address books can "
+"also be shared with other users in your workgroup."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
+msgid "Share Contacts with others"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:22
+msgid ""
+"Settings for sharing is controlled through the address book properties "
+"accessible through the *More actions* menu behind the gear icon the footer "
+"in the :ref:`addressbook-groups` list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
+msgid "Select the address book you want to share."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
+msgid "Choose *Edit address book* from the actions menu."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
+msgid "Switch to the *Sharing* tab in the properties form on the right."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
+msgid ""
+"The table displays who already has permission to see and modify the selected"
+" address book. Here you can manage permissions the same way as :ref:`Sharing"
+" a Folder <settings-folder-sharing>`."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
+msgid "Subscribe to Shared Address Books"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
+msgid ""
+"Address books shared by others are not showing up right away in the "
+"directories list of the web client. Switch to :ref:`Settings > Folders "
+"<settings-folders>` to see all resources you can access. There's a shortcut "
+"to this: click *Manage folders* in the actions menu behind the gear icon "
+"located the footer of the directory list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
+msgid ""
+"In order to make a shared address book appear in the address book view, "
+"locate it in the folder manager and check the *Subscribed* mark in the list."
+" Only subscribed directories are visible in the address book view."
+msgstr ""
diff --git a/plugins/kolab_addressbook/helpdocs/locale/tr_TR/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/tr_TR/LC_MESSAGES/addressbook.po
index 9e7bdc3b..507a06ad 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/tr_TR/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/tr_TR/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/uk/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/uk/LC_MESSAGES/addressbook.po
index 7ea31317..c7849c45 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/uk/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/uk/LC_MESSAGES/addressbook.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/vi/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/vi/LC_MESSAGES/addressbook.po
index 98d62d9a..8cf35b18 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/vi/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/vi/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/zh_CN/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/zh_CN/LC_MESSAGES/addressbook.po
index f29d7461..f331e3d7 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/zh_CN/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/zh_CN/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/helpdocs/locale/zh_TW/LC_MESSAGES/addressbook.po b/plugins/kolab_addressbook/helpdocs/locale/zh_TW/LC_MESSAGES/addressbook.po
index 189c62ee..d4db36ad 100644
--- a/plugins/kolab_addressbook/helpdocs/locale/zh_TW/LC_MESSAGES/addressbook.po
+++ b/plugins/kolab_addressbook/helpdocs/locale/zh_TW/LC_MESSAGES/addressbook.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/kolab_addressbook/kolab_addressbook.js b/plugins/kolab_addressbook/kolab_addressbook.js
index 6962e701..f9f1d54a 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.js
+++ b/plugins/kolab_addressbook/kolab_addressbook.js
@@ -29,55 +29,12 @@
 if (window.rcmail) {
     rcmail.addEventListener('init', function() {
         rcmail.set_book_actions();
-        if (rcmail.gui_objects.editform && rcmail.env.action.match(/^plugin\.book/)) {
-            rcmail.enable_command('book-save', true);
-        }
 
         // contextmenu
         kolab_addressbook_contextmenu();
 
         // append search form for address books
         if (rcmail.gui_objects.folderlist) {
-            var container = $(rcmail.gui_objects.folderlist);
-            $('<div class="listsearchbox" style="display:none">' +
-                '<div class="searchbox" role="search" aria-labelledby="aria-labelfoldersearchform" aria-controls="' + rcmail.gui_objects.folderlist.id + '">' +
-                    '<h3 id="aria-label-labelfoldersearchform" class="voice">' + rcmail.gettext('foldersearchform', 'kolab_addressbook') + '" /></h3>' +
-                    '<label for="addressbooksearch" class="voice">' + rcmail.gettext('searchterms', 'kolab_addressbook') + '</label>' +
-                    '<input type="text" name="q" id="addressbooksearch" placeholder="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" />' +
-                    '<a class="iconbutton searchicon"></a>' +
-                    '<a href="#reset" onclick="return rcmail.command(\'reset-listsearch\',null,this,event)" id="directorylistsearch-reset" class="iconbutton reset" title="' + rcmail.gettext('resetsearch') + '">' +
-                        rcmail.gettext('resetsearch') + '</a>' +
-                '</div>' +
-            '</div>')
-            .insertBefore(container.parent());
-
-            $('<a href="#search" class="iconbutton search" title="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" tabindex="0">' +
-                rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '</a>')
-                .appendTo('#directorylistbox h2.boxtitle')
-                .click(function(e){
-                    var title = $('#directorylistbox .boxtitle'),
-                        box = $('#directorylistbox .listsearchbox'),
-                        dir = box.is(':visible') ? -1 : 1;
-
-                    box.slideToggle({
-                        duration: 160,
-                        progress: function(animation, progress) {
-                            if (dir < 0) progress = 1 - progress;
-                            $('#directorylistbox .scroller').css('top', (title.outerHeight() + 34 * progress) + 'px');
-                        },
-                        complete: function() {
-                            box.toggleClass('expanded');
-                            if (box.is(':visible')) {
-                                box.find('input[type=text]').focus();
-                            }
-                            else {
-                                $('#directorylistsearch-reset').click();
-                            }
-                        }
-                    });
-                });
-
-
             // remove event handlers set by the regular treelist widget
             rcmail.treelist.container.off('click mousedown focusin focusout');
 
@@ -123,46 +80,40 @@ if (window.rcmail) {
                     if (data.length)
                         rcmail.display_message(rcmail.gettext('nraddressbooksfound','kolab_addressbook').replace('$nr', data.length), 'voice');
                     else
-                        rcmail.display_message(rcmail.gettext('noaddressbooksfound','kolab_addressbook'), 'info');
+                        rcmail.display_message(rcmail.gettext('noaddressbooksfound','kolab_addressbook'), 'notice');
                 });
         }
 
-        // append button to show contact audit trail
-        if (rcmail.env.action == 'show' && rcmail.env.kolab_audit_trail && rcmail.env.cid) {
-            $('<a href="#history" class="btn-contact-history active" role="button" tabindex="0">' + rcmail.get_label('kolab_addressbook.showhistory') + '</a>')
-                .click(function(e) {
-                    var rc = rcmail.is_framed() && parent.rcmail.contact_history_dialog ? parent.rcmail : rcmail;
-                    rc.contact_history_dialog();
-                    return false;
-                })
-                .appendTo($('<div>').addClass('formbuttons-secondary-kolab').appendTo('.formbuttons'));
-        }
+        rcmail.contact_list && rcmail.contact_list.addEventListener('select', function(list) {
+            var source, is_writable = true, is_traceable = false;
+
+            // delete/move commands status was set by Roundcube core,
+            // however, for Kolab addressbooks we like to check folder ACL
+            if (list.selection.length && rcmail.commands['delete']) {
+                $.each(rcmail.env.selection_sources, function() {
+                    source = rcmail.env.address_sources[this];
+                    if (source && source.kolab && source.rights.indexOf('t') < 0) {
+                        return is_writable = false;
+                    }
+                });
+
+                rcmail.enable_command('delete', 'move', is_writable);
+            }
+
+            if (list.get_single_selection()) {
+                $.each(rcmail.env.selection_sources, function() {
+                    source = rcmail.env.address_sources[this];
+                    is_traceable = source && !!source.audittrail;
+                });
+            }
+
+            rcmail.enable_command('contact-history-dialog', is_traceable);
+        });
     });
 
     rcmail.addEventListener('listupdate', function() {
         rcmail.set_book_actions();
     });
-
-    // wait until rcmail.contact_list is ready and subscribe to 'select' events
-    setTimeout(function() {
-        rcmail.contact_list && rcmail.contact_list.addEventListener('select', function(list) {
-            var source, is_writable = true;
-
-            // delete/move commands status was set by Roundcube core,
-            // however, for Kolab addressbooks we like to check folder ACL
-            if (list.selection.length && rcmail.commands['delete']) {
-                for (n in rcmail.env.selection_sources) {
-                    source = rcmail.env.address_sources[n];
-                    if (source && source.kolab && source.rights.indexOf('t') < 0) {
-                        is_writable = false;
-                        break;
-                    }
-                }
-
-                rcmail.enable_command('delete', 'move', is_writable);
-            }
-        });
-    }, 100);
 }
 
 // (De-)activates address book management commands
@@ -181,12 +132,48 @@ rcube_webmail.prototype.set_book_actions = function()
 
 rcube_webmail.prototype.book_create = function()
 {
-    this.book_show_contentframe('create');
+    this.book_dialog('create');
 };
 
 rcube_webmail.prototype.book_edit = function()
 {
-    this.book_show_contentframe('edit');
+    this.book_dialog('edit');
+};
+
+// displays page with book edit/create form
+rcube_webmail.prototype.book_dialog = function(action)
+{
+    var title = rcmail.gettext('kolab_addressbook.book' + action),
+        params = {_act: action, _source: this.book_realname(), _framed: 1},
+        dialog = $('<iframe>').attr('src', rcmail.url('plugin.book', params)),
+        save_func = function() {
+            var data,
+                form = dialog.contents().find('form'),
+                input = form.find("input[name='_name']");
+
+            // form is not loaded
+            if (!form || !form.length)
+                return false;
+
+            if (input.length && input.val() == '') {
+                rcmail.alert_dialog(rcmail.get_label('kolab_addressbook.nobooknamewarning'), function() {
+                    input.focus();
+                });
+
+                return;
+            }
+
+            // post data to server
+            data = form.serializeJSON();
+
+            rcmail.http_post('plugin.book-save', data, rcmail.set_busy(true, 'kolab_addressbook.booksaving'));
+            return true;
+        };
+
+    rcmail.simple_dialog(dialog, title, save_func, {
+        width: 600,
+        height: 400
+    });
 };
 
 rcube_webmail.prototype.book_remove = function(id)
@@ -200,9 +187,11 @@ rcube_webmail.prototype.book_remove = function(id)
 
 rcube_webmail.prototype.book_delete = function()
 {
-    if (this.env.source != '' && confirm(this.get_label('kolab_addressbook.bookdeleteconfirm'))) {
-        var lock = this.set_busy(true, 'kolab_addressbook.bookdeleting');
-        this.http_request('plugin.book', '_act=delete&_source='+urlencode(this.book_realname()), lock);
+    if (this.env.source != '') {
+        this.confirm_dialog(this.get_label('kolab_addressbook.bookdeleteconfirm'), 'delete', function() {
+            var lock = rcmail.set_busy(true, 'kolab_addressbook.bookdeleting');
+            rcmail.http_request('plugin.book', '_act=delete&_source='+urlencode(rcmail.book_realname()), lock);
+        });
     }
 };
 
@@ -218,71 +207,16 @@ rcube_webmail.prototype.book_showurl = function()
     }
 
     if (url) {
-        $('div.showurldialog:ui-dialog').dialog('close');
-
         var txt = rcmail.gettext('carddavurldescription', 'kolab_addressbook'),
-            $dialog = $('<div>').addClass('showurldialog').append('<p>' + txt + '</p>'),
-            textbox = $('<textarea>').addClass('urlbox').css('width', '100%').attr('rows', 2).appendTo($dialog);
+            dialog = $('<div>').addClass('showurldialog').append('<p>' + txt + '</p>'),
+            textbox = $('<textarea>').addClass('urlbox').css('width', '100%').attr('rows', 3).appendTo(dialog);
 
-        $dialog.dialog({
-            resizable: true,
-            closeOnEscape: true,
-            title: rcmail.gettext('bookshowurl', 'kolab_addressbook'),
-            close: function() {
-                $dialog.dialog("destroy").remove();
-            },
-            width: 520
-        }).show();
+        this.simple_dialog(dialog, rcmail.gettext('bookshowurl', 'kolab_addressbook'), null, {width: 520});
 
         textbox.val(url).select();
     }
 };
 
-// displays page with book edit/create form
-rcube_webmail.prototype.book_show_contentframe = function(action, framed)
-{
-    var add_url = '', target = window;
-
-    // unselect contact
-    this.contact_list.clear_selection();
-    this.enable_command('edit', 'delete', 'compose', false);
-
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
-        add_url = '&_framed=1';
-        target = window.frames[this.env.contentframe];
-        this.show_contentframe(true);
-    }
-    else if (framed)
-        return false;
-
-    if (action) {
-        this.lock_frame();
-        this.location_href(this.env.comm_path+'&_action=plugin.book&_act='+action
-            +'&_source='+urlencode(this.book_realname())
-            +add_url, target);
-    }
-
-    return true;
-};
-
-// submits book create/update form
-rcube_webmail.prototype.book_save = function()
-{
-    var form = this.gui_objects.editform,
-        input = $("input[name='_name']", form)
-
-    if (input.length && input.val() == '') {
-        alert(this.get_label('kolab_addressbook.nobooknamewarning'));
-        input.focus();
-        return;
-    }
-
-    input = this.display_message(this.get_label('kolab_addressbook.booksaving'), 'loading');
-    $('<input type="hidden" name="_unlock" />').val(input).appendTo(form);
-
-    form.submit();
-};
-
 // action executed after book delete
 rcube_webmail.prototype.book_delete_done = function(id, recur)
 {
@@ -332,8 +266,6 @@ rcube_webmail.prototype.book_update = function(data, old)
             })
         );
 
-    this.show_contentframe(false);
-
     // set row attributes
     if (data.readonly)
         classes.push('readonly');
@@ -588,7 +520,7 @@ rcube_webmail.prototype.close_contact_history_dialog = function(refresh)
 
 function kolab_addressbook_contextmenu()
 {
-    if (!window.rcm_callbackmenu_init) {
+    if (!rcmail.env.contextmenu) {
         return;
     }
 
@@ -597,101 +529,32 @@ function kolab_addressbook_contextmenu()
         rcmail.addEventListener('contextmenu_init', function(menu) {
             if (menu.menu_name == 'abooklist') {
                 menu.addEventListener('activate', function(p) {
-                    // deactivate kolab addressbook actions
-                    if (p.command.match(/^book-/)) {
-                        return p.command == 'book-create';
+                    var source = $(p.source).is('.addressbook') ? rcmail.html_identifier_decode($(p.source).attr('id').replace(/^rcmli/, '')) : null,
+                        sources = rcmail.env.address_sources,
+                        props = source && sources[source] && sources[source].kolab ?
+                            sources[source] : { readonly: true, removable: false, rights: '' };
+
+                    if (p.command == 'book-create') {
+                        return true;
                     }
-                });
-            }
-            else if (menu.menu_name == 'contactlist' && rcmail.env.kolab_audit_trail) {
-                // add "Show History" item to context menu
-                menu.menu_source.push({
-                    label: rcmail.get_label('kolab_addressbook.showhistory'),
-                    command: 'contact_history_dialog',
-                    classes: 'history'
-                });
-                // enable history item if the contact source supports it
-                menu.addEventListener('activate', function(p) {
-                    if (p.command == 'contact_history_dialog') {
-                        var source = rcmail.env.address_sources ? rcmail.env.address_sources[rcmail.env.source] : {};
-                        return !!source.audittrail;
+
+                    if (p.command == 'book-edit') {
+                        return props.rights.indexOf('a') >= 0;
+                    }
+
+                    if (p.command == 'book-delete') {
+                        return props.rights.indexOf('a') >= 0 || props.rights.indexOf('x') >= 0;
+                    }
+
+                    if (p.command == 'book-remove') {
+                        return props.removable;
+                    }
+
+                    if (p.command == 'book-showurl') {
+                        return !!(props.carddavurl);
                     }
                 });
             }
         });
     }
-
-    rcmail.env.kolab_addressbook_contextmenu = true;
-
-    // add menu on kolab addressbooks
-    var menu = rcm_callbackmenu_init({
-            menu_name: 'kolab_abooklist',
-            mouseover_timeout: -1, // no submenus here
-            menu_source: ['#directorylist-footer', '#groupoptionsmenu']
-        }, {
-            'activate': function(p) {
-                var source = !rcmail.env.group ? rcmail.env.source : null,
-                    sources = rcmail.env.address_sources,
-                    props = source && sources[source] && sources[source].kolab ?
-                        sources[source] : { readonly: true, removable: false, rights: '' };
-
-                if (p.command == 'book-create') {
-                    return true;
-                }
-
-                if (p.command == 'book-edit') {
-                    return props.rights.indexOf('a') >= 0;
-                }
-
-                if (p.command == 'book-delete') {
-                    return props.rights.indexOf('a') >= 0 || props.rights.indexOf('x') >= 0;
-                }
-
-                if (p.command == 'group-create') {
-                    return !props.readonly;
-                }
-
-                if (p.command == 'book-remove') {
-                    return props.removable;
-                }
-
-                if (p.command == 'book-showurl') {
-                    return !!(props.carddavurl);
-                }
-
-                if (p.command == 'group-rename' || p.command == 'group-delete') {
-                    return !!(rcmail.env.group && sources[rcmail.env.source] && !sources[rcmail.env.source].readonly);
-                }
-
-                return false;
-            },
-            'beforeactivate': function(p) {
-                // remove dummy items
-                $('li.submenu', p.ref.container).remove();
-
-                rcmail.env.kolab_old_source = rcmail.env.source;
-                rcmail.env.kolab_old_group = rcmail.env.group;
-
-                var elem = $(p.source), onclick = elem.attr('onclick');
-                if (onclick && onclick.match(rcmail.context_menu_command_pattern)) {
-                    rcmail.env.source = RegExp.$2;
-                    rcmail.env.group = null;
-                }
-                else if (elem.parent().hasClass('contactgroup')) {
-                    var grp = String(elem.attr('rel')).split(':');
-                    rcmail.env.source = grp[0];
-                    rcmail.env.group = grp[1];
-                }
-            },
-            'aftercommand': function(p) {
-                rcmail.env.source = rcmail.env.kolab_old_source;
-                rcmail.env.group = rcmail.env.kolab_old_group;
-            }
-        }
-    );
-
-    $('#directorylist').off('contextmenu').on('contextmenu', 'div > a, li.contactgroup > a', function(e) {
-        $(this).blur();
-        rcm_show_menu(e, this, $(this).attr('rel'), menu);
-    });
 };
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index 3b1451d3..2ddf8db2 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -29,7 +29,7 @@
 
 class kolab_addressbook extends rcube_plugin
 {
-    public $task = '?(?!login|logout).*';
+    public $task = '?(?!logout).*';
 
     private $sources;
     private $folders;
@@ -84,6 +84,17 @@ class kolab_addressbook extends rcube_plugin
                 $this->load_config();
                 require_once($this->home . '/lib/kolab_addressbook_ui.php');
                 $this->ui = new kolab_addressbook_ui($this);
+
+                if ($this->bonnie_api) {
+                    $this->add_button(array(
+                        'command'    => 'contact-history-dialog',
+                        'class'      => 'history contact-history',
+                        'classact'   => 'history contact-history active',
+                        'innerclass' => 'icon inner',
+                        'label'      => 'kolab_addressbook.showhistory',
+                        'type'       => 'link-menuitem'
+                    ), 'contactmenu');
+                }
             }
         }
         else if ($this->rc->task == 'settings') {
@@ -97,7 +108,6 @@ class kolab_addressbook extends rcube_plugin
         $this->add_hook('folder_update', array($this, 'prefs_folder_update'));
     }
 
-
     /**
      * Handler for the addressbooks_list hook.
      *
@@ -202,7 +212,9 @@ class kolab_addressbook extends rcube_plugin
 
         // render a hierarchical list of kolab contact folders
         kolab_storage::folder_hierarchy($this->folders, $tree);
-        $out .= $this->folder_tree_html($tree, $sources, $jsdata);
+        if ($tree && !empty($tree->children)) {
+            $out .= $this->folder_tree_html($tree, $sources, $jsdata);
+        }
 
         $this->rc->output->set_env('contactgroups', array_filter($jsdata, function($src){ return $src['type'] == 'group'; }));
         $this->rc->output->set_env('address_sources', array_filter($jsdata, function($src){ return $src['type'] != 'group'; }));
@@ -340,13 +352,16 @@ class kolab_addressbook extends rcube_plugin
      */
     public function config_get($args)
     {
-        if ($args['name'] != 'autocomplete_addressbooks') {
+        if ($args['name'] != 'autocomplete_addressbooks' || $this->recurrent) {
             return $args;
         }
 
         $abook_prio = $this->addressbook_prio();
-        // here we cannot use rc->config->get()
-        $sources    = $GLOBALS['CONFIG']['autocomplete_addressbooks'];
+
+        // Get the original setting, use temp flag to prevent from an infinite recursion
+        $this->recurrent = true;
+        $sources = $this->rc->config->get('autocomplete_addressbooks');
+        $this->recurrent = false;
 
         // Disable all global address books
         // Assumes that all non-kolab_addressbook sources are global
@@ -932,15 +947,16 @@ class kolab_addressbook extends rcube_plugin
 
             $this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
             $this->rc->output->command('book_update', $props, kolab_storage::folder_id($prop['oldname'], true));
-            $this->rc->output->send('iframe');
+        }
+        else {
+            if (!$error) {
+                $error = $plugin['message'] ? $plugin['message'] : 'kolab_addressbook.book'.$type.'error';
+            }
+
+            $this->rc->output->show_message($error, 'error');
         }
 
-        if (!$error)
-            $error = $plugin['message'] ? $plugin['message'] : 'kolab_addressbook.book'.$type.'error';
-
-        $this->rc->output->show_message($error, 'error');
-        // display the form again
-        $this->ui->book_edit();
+        $this->rc->output->send('iframe');
     }
 
     /**
@@ -1025,7 +1041,7 @@ class kolab_addressbook extends rcube_plugin
 
         // report more results available
         if ($search_more_results) {
-            $this->rc->output->show_message('autocompletemore', 'info');
+            $this->rc->output->show_message('autocompletemore', 'notice');
         }
 
         $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
index 26455cf1..58e09731 100644
--- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
+++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
@@ -56,9 +56,11 @@ class kolab_addressbook_ui
 
             // include kolab folderlist widget if available
             if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
-                $this->plugin->api->include_script('libkolab/js/folderlist.js');
+                $this->plugin->api->include_script('libkolab/libkolab.js');
             }
 
+            $this->rc->output->add_footer($this->rc->output->parse('kolab_addressbook.search_addon', false, false));
+
             // Add actions on address books
             $options = array('book-create', 'book-edit', 'book-delete', 'book-remove');
             $idx     = 0;
@@ -85,8 +87,10 @@ class kolab_addressbook_ui
                     $this->plugin->api->output->button(array(
                         'label'    => 'kolab_addressbook.'.str_replace('-', '', $command),
                         'domain'   => $this->ID,
-                        'classact' => 'active',
-                        'command'  => $command
+                        'class'    => str_replace('-', ' ', $command) . ' disabled',
+                        'classact' => str_replace('-', ' ', $command) . ' active',
+                        'command'  => $command,
+                        'type'     => 'link'
                 )));
                 $this->plugin->api->add_content($content, 'groupoptions');
                 $idx++;
@@ -97,18 +101,23 @@ class kolab_addressbook_ui
                 $this->plugin->api->output->button(array(
                     'label'    => 'managefolders',
                     'type'     => 'link',
-                    'classact' => 'active',
+                    'class'    => 'folders disabled',
+                    'classact' => 'folders active',
                     'command'  => 'folders',
                     'task'     => 'settings',
             )));
             $this->plugin->api->add_content($content, 'groupoptions');
 
-            $this->rc->output->add_label('kolab_addressbook.bookdeleteconfirm',
-                'kolab_addressbook.bookdeleting', 'kolab_addressbook.bookshowurl',
+            $this->rc->output->add_label(
+                'kolab_addressbook.bookdeleteconfirm',
+                'kolab_addressbook.bookdeleting',
                 'kolab_addressbook.carddavurldescription',
-                'kolab_addressbook.bookedit',
                 'kolab_addressbook.bookdelete',
                 'kolab_addressbook.bookshowurl',
+                'kolab_addressbook.bookedit',
+                'kolab_addressbook.bookcreate',
+                'kolab_addressbook.nobooknamewarning',
+                'kolab_addressbook.booksaving',
                 'kolab_addressbook.findaddressbooks',
                 'kolab_addressbook.searchterms',
                 'kolab_addressbook.foldersearchform',
@@ -116,12 +125,12 @@ class kolab_addressbook_ui
                 'kolab_addressbook.nraddressbooksfound',
                 'kolab_addressbook.noaddressbooksfound',
                 'kolab_addressbook.foldersubscribe',
-                'resetsearch');
-
+                'resetsearch'
+            );
 
             if ($this->plugin->bonnie_api) {
                 $this->rc->output->set_env('kolab_audit_trail', true);
-                $this->plugin->api->include_script('libkolab/js/audittrail.js');
+                $this->plugin->api->include_script('libkolab/libkolab.js');
 
                 $this->rc->output->add_label(
                     'kolab_addressbook.showhistory',
@@ -138,27 +147,21 @@ class kolab_addressbook_ui
         }
         // include stylesheet for audit trail
         else if ($this->rc->action == 'show' && $this->plugin->bonnie_api) {
-            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css');
+            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css', true);
             $this->rc->output->add_label('kolab_addressbook.showhistory');
         }
-        // book create/edit form
-        else {
-            $this->rc->output->add_label('kolab_addressbook.nobooknamewarning',
-                'kolab_addressbook.booksaving');
-        }
     }
 
-
     /**
      * Handler for address book create/edit action
      */
     public function book_edit()
     {
-        $this->rc->output->add_handler('bookdetails', array($this, 'book_form'));
-        $this->rc->output->send('kolab_addressbook.bookedit');
+        $this->rc->output->set_env('pagetitle', $this->plugin->gettext('bookproperties'));
+        $this->rc->output->add_handler('folderform', array($this, 'book_form'));
+        $this->rc->output->send('libkolab.folderform');
     }
 
-
     /**
      * Handler for 'bookdetails' object returning form content for book create/edit
      *
@@ -177,17 +180,7 @@ class kolab_addressbook_ui
         $storage = $this->rc->get_storage();
         $delim   = $storage->get_hierarchy_delimiter();
 
-        if ($this->rc->action == 'plugin.book-save') {
-            // save error
-            $name      = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_GPC, true)); // UTF8
-            $old       = trim(rcube_utils::get_input_value('_oldname', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
-            $path_imap = trim(rcube_utils::get_input_value('_parent', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
-
-            $hidden_fields[] = array('name' => '_oldname', 'value' => $old);
-
-            $folder = $old;
-        }
-        else if ($action == 'edit') {
+        if ($action == 'edit') {
             $path_imap = explode($delim, $folder);
             $name      = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
             $path_imap = implode($path_imap, $delim);
@@ -205,11 +198,12 @@ class kolab_addressbook_ui
             $options = $storage->folder_info($folder);
         }
 
-        $form   = array();
+        $form = array();
 
         // General tab
-        $form['props'] = array(
-            'name' => $this->rc->gettext('properties'),
+        $form['properties'] = array(
+            'name'   => $this->rc->gettext('properties'),
+            'fields' => array(),
         );
 
         if (!empty($options) && ($options['norename'] || $options['protected'])) {
@@ -220,14 +214,10 @@ class kolab_addressbook_ui
             $foldername = $foldername->show($name);
         }
 
-        $form['props']['fieldsets']['location'] = array(
-            'name'  => $this->rc->gettext('location'),
-            'content' => array(
-                'name' => array(
-                    'label' => $this->plugin->gettext('bookname'),
-                    'value' => $foldername,
-                ),
-            ),
+        $form['properties']['fields']['name'] = array(
+            'label' => $this->plugin->gettext('bookname'),
+            'value' => $foldername,
+            'id'    => '_name',
         );
 
         if (!empty($options) && ($options['norename'] || $options['protected'])) {
@@ -235,51 +225,19 @@ class kolab_addressbook_ui
             $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap);
         }
         else {
-            $select = kolab_storage::folder_selector('contact', array('name' => '_parent'), $folder);
+            $prop   = array('name' => '_parent', 'id' => '_parent');
+            $select = kolab_storage::folder_selector('contact', $prop, $folder);
 
-            $form['props']['fieldsets']['location']['content']['path'] = array(
+            $form['properties']['fields']['parent'] = array(
                 'label' => $this->plugin->gettext('parentbook'),
                 'value' => $select->show(strlen($folder) ? $path_imap : ''),
+                'id'    => '_parent',
             );
         }
 
-        // Allow plugins to modify address book form content (e.g. with ACL form)
-        $plugin = $this->rc->plugins->exec_hook('addressbook_form',
-            array('form' => $form, 'options' => $options, 'name' => $folder));
+        $form_html = kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
 
-        $form = $plugin['form'];
-
-        // Set form tags and hidden fields
-        list($form_start, $form_end) = $this->get_form_tags($attrib, 'plugin.book-save', null, $hidden_fields);
-
-        unset($attrib['form']);
-
-        // return the complete edit form as table
-        $out = "$form_start\n";
-
-        // Create form output
-        foreach ($form as $tab) {
-            if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
-                $content = '';
-                foreach ($tab['fieldsets'] as $fieldset) {
-                    $subcontent = $this->get_form_part($fieldset);
-                    if ($subcontent) {
-                        $content .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($fieldset['name'])) . $subcontent) ."\n";
-                    }
-                }
-            }
-            else {
-                $content = $this->get_form_part($tab);
-            }
-
-            if ($content) {
-                $out .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) ."\n";
-            }
-        }
-
-        $out .= "\n$form_end";
-
-        return $out;
+        return html::tag('form', $attrib + array('action' => 'plugin.book-save', 'method' => 'post', 'id' => 'bookpropform'), $form_html);
     }
 
     /**
@@ -295,58 +253,4 @@ class kolab_addressbook_ui
 
         return $p;
     }
-
-
-    private function get_form_part($form)
-    {
-        $content = '';
-
-        if (is_array($form['content']) && !empty($form['content'])) {
-            $table = new html_table(array('cols' => 2, 'class' => 'propform'));
-            foreach ($form['content'] as $col => $colprop) {
-                $colprop['id'] = '_'.$col;
-                $label = !empty($colprop['label']) ? $colprop['label'] : $this->rc->gettext($col);
-
-                $table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], rcube::Q($label)));
-                $table->add(null, $colprop['value']);
-            }
-            $content = $table->show();
-        }
-        else {
-            $content = $form['content'];
-        }
-
-        return $content;
-    }
-
-
-    private function get_form_tags($attrib, $action, $id = null, $hidden = null)
-    {
-        $form_start = $form_end = '';
-
-        $request_key = $action . (isset($id) ? '.'.$id : '');
-        $form_start = $this->rc->output->request_form(array(
-            'name'    => 'form',
-            'method'  => 'post',
-            'task'    => $this->rc->task,
-            'action'  => $action,
-            'request' => $request_key,
-            'noclose' => true,
-        ) + $attrib);
-
-        if (is_array($hidden)) {
-            foreach ($hidden as $field) {
-                $hiddenfield = new html_hiddenfield($field);
-                $form_start .= $hiddenfield->show();
-            }
-        }
-
-        $form_end = !strlen($attrib['form']) ? '</form>' : '';
-
-        $EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
-        $this->rc->output->add_gui_object('editform', $EDIT_FORM);
-
-        return array($form_start, $form_end);
-    }
-
 }
diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index b53f8f5f..b301ffad 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -290,21 +290,24 @@ class rcube_kolab_contacts extends rcube_addressbook
     /**
      * List all active contact groups of this source
      *
-     * @param string  Optional search string to match group name
+     * @param string Optional search string to match group name
+     * @param int    Search mode. Sum of self::SEARCH_*
+     *
      * @return array  Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null)
+    function list_groups($search = null, $mode = 0)
     {
         $this->_fetch_groups();
         $groups = array();
 
         foreach ((array)$this->distlists as $group) {
-            if (!$search || strstr(strtolower($group['name']), strtolower($search)))
-                $groups[$group['name']] = array('ID' => $group['ID'], 'name' => $group['name']);
+            if (!$search || strstr(mb_strtolower($group['name']), mb_strtolower($search))) {
+                $groups[$group['ID']] = array('ID' => $group['ID'], 'name' => $group['name']);
+            }
         }
 
-        // sort groups
-        ksort($groups, SORT_LOCALE_STRING);
+        // sort groups by name
+        uasort($groups, function($a, $b) { return strcoll($a['name'], $b['name']); });
 
         return array_values($groups);
     }
@@ -352,7 +355,7 @@ class rcube_kolab_contacts extends rcube_addressbook
 
             // get members by UID
             if (!empty($uids)) {
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), !$fetch_all);
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids));
                 $this->sortindex = array_merge($this->sortindex, $local_sortindex);
             }
         }
@@ -360,7 +363,7 @@ class rcube_kolab_contacts extends rcube_addressbook
             $ids = $this->filter['ids'];
             if (count($ids)) {
                 $uids = array_map(array($this, 'id2uid'), $this->filter['ids']);
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), true);
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids));
             }
         }
         else {
@@ -414,6 +417,7 @@ class rcube_kolab_contacts extends rcube_addressbook
      *                          0 - partial (*abc*),
      *                          1 - strict (=),
      *                          2 - prefix (abc*)
+     *                          4 - include groups (if supported)
      * @param boolean $select   True if results are requested, False if count only
      * @param boolean $nocount  True to skip the count query (select only)
      * @param array   $required List of fields that cannot be empty
@@ -436,7 +440,7 @@ class rcube_kolab_contacts extends rcube_addressbook
             return $result;
         }
         else if ($fields == '*') {
-          $fields = $this->search_fields;
+            $fields = $this->search_fields;
         }
 
         if (!is_array($fields))
@@ -465,6 +469,8 @@ class rcube_kolab_contacts extends rcube_addressbook
             $squery[] = array('tags', '=', 'x-has-birthday');
         }
 
+        $squery[] = array('type', '=', 'contact');
+
         // get all/matching records
         $this->_fetch_contacts($squery);
 
@@ -788,14 +794,16 @@ class rcube_kolab_contacts extends rcube_addressbook
 
     /**
      * Remove all records from the database
+     *
+     * @param bool $with_groups Remove also groups
      */
-    public function delete_all()
+    public function delete_all($with_groups = false)
     {
         if ($this->storagefolder->delete_all()) {
-            $this->contacts = array();
+            $this->contacts  = array();
             $this->sortindex = array();
-            $this->dataset = null;
-            $this->result = null;
+            $this->dataset   = null;
+            $this->result    = null;
         }
     }
 
@@ -877,9 +885,11 @@ class rcube_kolab_contacts extends rcube_addressbook
      *
      * @param string Group identifier
      * @param string New name to set for this group
+     * @param string New group identifier (if changed, otherwise don't set)
+     *
      * @return boolean New name on success, false if no data was changed
      */
-    function rename_group($gid, $newname)
+    function rename_group($gid, $newname, &$newid)
     {
         $this->_fetch_groups();
         $list = $this->distlists[$gid];
@@ -1025,10 +1035,11 @@ class rcube_kolab_contacts extends rcube_addressbook
      * If input not valid, the message to display can be fetched using get_error()
      *
      * @param array Associative array with contact data to save
+     * @param bool  Attempt to fix/complete data automatically
      *
      * @return boolean True if input is valid, False if not.
      */
-    public function validate(&$save_data)
+    public function validate(&$save_data, $autofix = false)
     {
         // validate e-mail addresses
         $valid = parent::validate($save_data);
@@ -1055,10 +1066,13 @@ class rcube_kolab_contacts extends rcube_addressbook
     {
         if (!isset($this->dataset) || !empty($query)) {
             if ($limit) {
-                $this->storagefolder->set_order_and_limit($this->_sort_columns(), $this->page_size, ($this->list_page-1) * $this->page_size);
+                $size = is_int($limit) && $limit < $this->page_size ? $limit : $this->page_size;
+                $this->storagefolder->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page-1) * $this->page_size);
             }
+
             $this->sortindex = array();
-            $this->dataset = $this->storagefolder->select($query);
+            $this->dataset   = $this->storagefolder->select($query);
+
             foreach ($this->dataset as $idx => $record) {
                 $contact = $this->_to_rcube_contact($record);
                 $this->sortindex[$idx] = $this->_sort_string($contact);
@@ -1123,7 +1137,7 @@ class rcube_kolab_contacts extends rcube_addressbook
     {
         if (!isset($this->distlists)) {
             $this->distlists = $this->groupmembers = array();
-            foreach ($this->storagefolder->get_objects('distribution-list') as $record) {
+            foreach ($this->storagefolder->select('distribution-list') as $record) {
                 $record['ID'] = $this->uid2id($record['uid']);
                 foreach ((array)$record['member'] as $i => $member) {
                     $mid = $this->uid2id($member['uid'] ? $member['uid'] : 'mailto:' . $member['email']);
@@ -1174,10 +1188,14 @@ class rcube_kolab_contacts extends rcube_addressbook
         }
 
         if (count($cols) == count($fields)) {
-            switch ($mode) {
-                case 1:  $prefix = '^'; $suffix = '$'; break;  // strict
-                case 2:  $prefix = '^'; $suffix = '';  break;  // prefix
-                default: $prefix = '';  $suffix = '';  break;  // substring
+            if ($mode & rcube_addressbook::SEARCH_STRICT) {
+                $prefix = '^'; $suffix = '$';
+            }
+            else if ($mode & rcube_addressbook::SEARCH_PREFIX) {
+                $prefix = '^'; $suffix = '';
+            }
+            else {
+                $prefix = ''; $suffix = '';
             }
 
             $search_string = is_array($value) ? join(' ', $value) : $value;
diff --git a/plugins/kolab_addressbook/localization/bg.inc b/plugins/kolab_addressbook/localization/bg.inc
new file mode 100644
index 00000000..a5d47025
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/bg.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['bookremove'] = 'Премахване от списъка';
+$labels['foldersubscribe'] = 'Постоянен списък';
+?>
diff --git a/plugins/kolab_addressbook/localization/ca_ES.inc b/plugins/kolab_addressbook/localization/ca_ES.inc
index a56d801f..5a708c5c 100644
--- a/plugins/kolab_addressbook/localization/ca_ES.inc
+++ b/plugins/kolab_addressbook/localization/ca_ES.inc
@@ -8,4 +8,6 @@
  */
 $labels['searchterms'] = 'Termes de cerca';
 $labels['foldersubscribe'] = 'Llista permanentment';
+$labels['objectchangelog'] = 'Canvia historial';
+$labels['objectdiffnotavailable'] = 'No és possible comparar les revisions seleccionades';
 ?>
diff --git a/plugins/kolab_addressbook/localization/cs_CZ.inc b/plugins/kolab_addressbook/localization/cs_CZ.inc
index 0c30de5b..efa0928f 100644
--- a/plugins/kolab_addressbook/localization/cs_CZ.inc
+++ b/plugins/kolab_addressbook/localization/cs_CZ.inc
@@ -37,13 +37,21 @@ $labels['personalfirst'] = 'Nejprve osobní adresář(e)';
 $labels['globalfirst'] = 'Nejprve globální adresář(e)';
 $labels['personalonly'] = 'Pouze osobní adresář(e)';
 $labels['globalonly'] = 'Pouze globální adresář(e)';
-$labels['findaddressbooks'] = 'Hledat adresáře';
 $labels['searchterms'] = 'Hledané výrazy';
 $labels['listsearchresults'] = 'Další adresáře';
 $labels['foldersearchform'] = 'Vyhledávací formulář pro adresář';
 $labels['foldersubscribe'] = 'Ukazovat seznam trvale';
 $labels['nraddressbooksfound'] = 'Nalezeno $nr adresářů';
 $labels['noaddressbooksfound'] = 'Nenalezeny žádné adresáře';
+$labels['showhistory'] = 'Ukázat historii';
+$labels['objectchangelog'] = 'Historie změn';
+$labels['objectdiff'] = 'Změny od $rev1 do $rev2';
+$labels['revisionrestoreconfirm'] = 'Opravdu chcete obnovit pozměnění $rev tohoto kontaktu? To nahradí současný kontakt se starou verzí.';
+$labels['objectnotfound'] = 'Nepodařilo se nahrát data kontaktu';
+$labels['objectchangelognotavailable'] = 'Historie změn není dostupná pro tento kontakt';
+$labels['objectdiffnotavailable'] = 'Pro vybrané verze není žádné srovnání možné';
+$labels['objectrestoresuccess'] = 'Změna $rev úspěšně obnovena';
+$labels['objectrestoreerror'] = 'Nepodařilo se obnovit starou změnu';
 $messages['bookdeleteconfirm']  = 'Opravdu chcete smazat označený adresář a veškeré obsažené kontakty?';
 $messages['bookdeleting'] = 'Maže se adresář...';
 $messages['booksaving'] = 'Adresář se ukládá...';
diff --git a/plugins/kolab_addressbook/localization/da_DK.inc b/plugins/kolab_addressbook/localization/da_DK.inc
index 7d0e77e4..062f87ed 100644
--- a/plugins/kolab_addressbook/localization/da_DK.inc
+++ b/plugins/kolab_addressbook/localization/da_DK.inc
@@ -37,13 +37,21 @@ $labels['personalfirst'] = 'Personlige adressebøger først';
 $labels['globalfirst'] = 'Globale adressebøger først';
 $labels['personalonly'] = 'Kun personlige adresse';
 $labels['globalonly'] = 'Kun globale adressebøger';
-$labels['findaddressbooks'] = 'Find adressebøger';
-$labels['searchterms'] = 'Search terms';
+$labels['searchterms'] = 'Søgetermer';
 $labels['listsearchresults'] = 'Yderligere adressebøger';
 $labels['foldersearchform'] = 'Søgeformular for adressebog';
-$labels['foldersubscribe'] = 'List permanently';
+$labels['foldersubscribe'] = 'Vis permanent';
 $labels['nraddressbooksfound'] = 'Der blev fundet $nr adressebøger ';
 $labels['noaddressbooksfound'] = 'Fandt ingen adressebøger';
+$labels['showhistory'] = 'Vis historik';
+$labels['objectchangelog'] = 'Ændringshistorik';
+$labels['objectdiff'] = 'Ændringer fra $rev1 til $rev2';
+$labels['revisionrestoreconfirm'] = 'Er du sikker på at du vil genskabe revision $rev af denne kontakt? Det vil overskirve den nuværende kontakt med en tidligere version.';
+$labels['objectnotfound'] = 'Kunne ikke læse kontakt data';
+$labels['objectchangelognotavailable'] = 'Ændringshistorik er ikke tilgængelig for denne kontakt.';
+$labels['objectdiffnotavailable'] = 'Det er ikke muligt at sammenligne de valgte revisioner';
+$labels['objectrestoresuccess'] = 'Revision $rev blev genskabt';
+$labels['objectrestoreerror'] = 'Mislykkedes med at genskabe den gamle revision';
 $messages['bookdeleteconfirm']  = 'Vil du virkelig slette den valgte adressebog og alle kontakterne i den?';
 $messages['bookdeleting'] = 'Sletter adressebog...';
 $messages['booksaving'] = 'Gemmer adressebog...';
diff --git a/plugins/kolab_addressbook/localization/de_CH.inc b/plugins/kolab_addressbook/localization/de_CH.inc
index 0a31e790..87579f5f 100644
--- a/plugins/kolab_addressbook/localization/de_CH.inc
+++ b/plugins/kolab_addressbook/localization/de_CH.inc
@@ -30,20 +30,28 @@ $labels['bookremove'] = 'Remove from list';
 $labels['bookproperties'] = 'Eigenschaften des Adressbuchs';
 $labels['bookname'] = 'Name des Buches';
 $labels['parentbook'] = 'Übergeordnetes Buch';
-$labels['bookshowurl'] = 'Show CardDAV URL';
-$labels['carddavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> client application to fully synchronize this specific address book with your computer or mobile device.';
+$labels['bookshowurl'] = 'CardDAV URL anzeigen';
+$labels['carddavurldescription'] = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-Klienten kopieren, um dasAdressbuch mit einem Computer oder mobilen Gerät zu synchronisieren.';
 $labels['addressbookprio'] = 'Reihenfolge der Adressbücher';
 $labels['personalfirst'] = 'Private(s) Adressbuch/Adressbücher zuerst';
 $labels['globalfirst'] = 'Globale(s) Adressbuch/Adressbücher zuerst';
 $labels['personalonly'] = 'Nur persönliche(s) Adressbuch/Adressbücher';
 $labels['globalonly'] = 'Nur globale(s) Adressbuch/Adressbücher';
-$labels['findaddressbooks'] = 'Find address books';
-$labels['searchterms'] = 'Search terms';
-$labels['listsearchresults'] = 'Additional address books';
-$labels['foldersearchform'] = 'Address book search form';
-$labels['foldersubscribe'] = 'List permanently';
-$labels['nraddressbooksfound'] = '$nr address books found';
-$labels['noaddressbooksfound'] = 'No address books found';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['listsearchresults'] = 'Zusätzliche Adressbücher';
+$labels['foldersearchform'] = 'Suchformular für Adressbuch';
+$labels['foldersubscribe'] = 'Permanent anzeigen';
+$labels['nraddressbooksfound'] = '$nr Adressbücher gefunden';
+$labels['noaddressbooksfound'] = 'Keine Adressbücher gefunden';
+$labels['showhistory'] = 'Verlauf anzeigen';
+$labels['objectchangelog'] = 'Änderungsverlauf';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['revisionrestoreconfirm'] = 'Wollen Sie wirklich die Version $rev dieses Kontakt wiederherstellen? Diese Aktion wird die aktuelle Kopie mit der älteren Version ersetzen.';
+$labels['objectnotfound'] = 'Fehler beim Laden der Addressedaten';
+$labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diesen Kontakt';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['objectrestoresuccess'] = 'Version $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
 $messages['bookdeleteconfirm']  = 'Soll das gewählte Adressbuch und alle Kontakte darin wirklich gelöscht werden?';
 $messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
 $messages['booksaving'] = 'Adressbuch wird gespeichert...';
diff --git a/plugins/kolab_addressbook/localization/de_DE.inc b/plugins/kolab_addressbook/localization/de_DE.inc
index e1011ac5..51f0d770 100644
--- a/plugins/kolab_addressbook/localization/de_DE.inc
+++ b/plugins/kolab_addressbook/localization/de_DE.inc
@@ -37,13 +37,21 @@ $labels['personalfirst'] = 'Private(s) Adressbuch/Adressbücher zuerst';
 $labels['globalfirst'] = 'Globale(s) Adressbuch/Adressbücher zuerst';
 $labels['personalonly'] = 'Nur persönliche(s) Adressbuch/Adressbücher';
 $labels['globalonly'] = 'Nur globale(s) Adressbuch/Adressbücher';
-$labels['findaddressbooks'] = 'Adressbücher finden';
 $labels['searchterms'] = 'Suchbegriffe';
 $labels['listsearchresults'] = 'Zusätzliche Adressbücher';
 $labels['foldersearchform'] = 'Suchformular für Adressbuch';
 $labels['foldersubscribe'] = 'Permanent anzeigen';
 $labels['nraddressbooksfound'] = '$nr Adressbücher gefunden';
 $labels['noaddressbooksfound'] = 'Keine Adressbücher gefunden';
+$labels['showhistory'] = 'Historie anzeigen';
+$labels['objectchangelog'] = 'Änderungshistorie';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['revisionrestoreconfirm'] = 'Wollen Sie wirklich die Version $rev dieses Kontakt wiederherstellen? Diese Aktion wird die aktuelle Kopie mit der älteren Version ersetzen.';
+$labels['objectnotfound'] = 'Fehler beim Laden der Addressedaten';
+$labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diesen Kontakt';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
 $messages['bookdeleteconfirm']  = 'Soll das gewählte Adressbuch und alle Kontakte darin wirklich gelöscht werden?';
 $messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
 $messages['booksaving'] = 'Adressbuch wird gespeichert...';
diff --git a/plugins/kolab_addressbook/localization/el.inc b/plugins/kolab_addressbook/localization/el.inc
new file mode 100644
index 00000000..382cc7a1
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/el.inc
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['initials'] = 'Αρχικά';
+$labels['profession'] = 'Επάγγελμα';
+$labels['officelocation'] = 'Τοποθεσία γραφείου';
+$labels['children'] = 'Παιδί';
+$labels['pgppublickey'] = 'Δημόσιο κλειδί PGP';
+$labels['pkcs7publickey'] = 'Δημόσιο κλειδί S/MIME';
+$labels['typebusiness'] = 'Εργασία';
+$labels['typebusinessfax'] = 'Fax εργασίας';
+$labels['typecompany'] = 'Εταιρία';
+$labels['typeprimary'] = 'Πρωτεύον';
+$labels['typetelex'] = 'Telex';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['settings'] = 'Ρυθμίσεις';
+$labels['bookcreate'] = 'Δημιουργία βιβλίου διευθύνσεων';
+$labels['bookedit'] = 'Επεξεργασία βιβλίου διευθύνσεων';
+$labels['bookdelete'] = 'Διαγραφή βιβλίου διευθύνσεων';
+$labels['bookremove'] = 'Αφαίρεση από την λίστα';
+$labels['bookproperties'] = 'Ιδιότητες βιβλίου διευθύνσεων';
+$labels['bookname'] = 'Όνομα βιβλίου';
+$labels['bookshowurl'] = 'Εμφάνιση URL για CardDAV';
+$labels['carddavurldescription'] = 'Αντιγράψτε αυτή τη διεύθυνση στον πελάτη <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> για πλήρη συγχρονισμό του συγκεκριμένου βιβλίου με τον υπολογιστή σας ή το κινητό σας.';
+$labels['searchterms'] = 'Όροι αναζήτησης';
+$labels['listsearchresults'] = 'Επιπλέον βιβλία διευθύνσεων';
+$labels['showhistory'] = 'Προβολή ιστορικού';
+$labels['objectchangelog'] = 'Αλλαγή ιστορικού';
+$labels['objectnotfound'] = 'Αποτυχία φόρτωσης δεδομένων επαφής';
+$messages['bookdeleting'] = 'Γίνεται διαγραφή βιβλίου διευθύνσεων...';
+$messages['booksaving'] = 'Γίνεται αποθήκευση βιβλίου διευθύνσεων';
+$messages['bookdeleted'] = 'Επιτυχημένη διαγραφή βιβλίου διευθύνσεων.';
+$messages['bookupdated'] = 'Επιτυχημένη ενημέρωση βιβλίου διευθύνσεων.';
+$messages['bookcreated'] = 'Επιτυχημένη δημιουργία βιβλίου διευθύνσεων.';
+$messages['bookdeleteerror'] = 'Παρουσιάστηκε σφάλμα κατά την διαγραφή του βιβλίου διευθύνσεων.';
+$messages['bookupdateerror'] = 'Παρουσιάστηκε σφάλμα κατά την ενημέρωση του βιβλίου διευθύνσεων.';
+$messages['bookcreateerror'] = 'Παρουσιάστηκε σφάλμα κατά την δημιουργία του βιβλίου διευθύνσεων.';
+$messages['nobooknamewarning'] = 'Παρακαλούμε, εισάγετε όνομα του βιβλίου διευθύνσεων.';
+$messages['noemailnamewarning'] = 'Παρακαλούμε, εισάγετε διεύθυνση ηλεκτρονικου ταχυδρομείου ή όνομα επαφής.';
+?>
diff --git a/plugins/kolab_addressbook/localization/en_US.inc b/plugins/kolab_addressbook/localization/en_US.inc
index 885d75d3..85e30b93 100644
--- a/plugins/kolab_addressbook/localization/en_US.inc
+++ b/plugins/kolab_addressbook/localization/en_US.inc
@@ -43,7 +43,7 @@ $labels['globalfirst'] = 'Global address book(s) first';
 $labels['personalonly'] = 'Personal address book(s) only';
 $labels['globalonly'] = 'Global address book(s) only';
 
-$labels['findaddressbooks'] = 'Find address books';
+$labels['findaddressbooks'] = 'Find address books...';
 $labels['searchterms'] = 'Search terms';
 $labels['listsearchresults'] = 'Additional address books';
 $labels['foldersearchform'] = 'Address book search form';
diff --git a/plugins/kolab_addressbook/localization/es_AR.inc b/plugins/kolab_addressbook/localization/es_AR.inc
index 183e280b..1b2505d6 100644
--- a/plugins/kolab_addressbook/localization/es_AR.inc
+++ b/plugins/kolab_addressbook/localization/es_AR.inc
@@ -37,13 +37,21 @@ $labels['personalfirst'] = 'Libreta(s) de direcciones personal primero';
 $labels['globalfirst'] = 'Libreta(s) de direcciones globales primero';
 $labels['personalonly'] = 'Sólo libreta(s) de direcciones personal';
 $labels['globalonly'] = 'Sólo libreta(s) de direcciones global';
-$labels['findaddressbooks'] = 'Encontrar libreta de direcciones';
 $labels['searchterms'] = 'Buscar términos';
 $labels['listsearchresults'] = 'Libreta de direcciones adicional';
 $labels['foldersearchform'] = 'Formulario de búsqueda de libreta de direcciones';
 $labels['foldersubscribe'] = 'Listar permanentemente';
 $labels['nraddressbooksfound'] = '$nr libretas de direcciones encontrada(s)';
 $labels['noaddressbooksfound'] = 'No se encontraron libretas de direcciones';
+$labels['showhistory'] = 'Mostrar Historial';
+$labels['objectchangelog'] = 'Cambiar Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
+$labels['revisionrestoreconfirm'] = 'Confirme que quiere recuperar la revisión $rev de este contacto. Esta acción reemplazará el evento actual con la versión anterior.';
+$labels['objectnotfound'] = 'Fallo al cargar datos del contacto';
+$labels['objectchangelognotavailable'] = 'Cambiar historial no está disponible para este contacto';
+$labels['objectdiffnotavailable'] = 'No es posible comparar las revisiones seleccionadas';
+$labels['objectrestoresuccess'] = 'Revisión $rev recuperada exitosamente';
+$labels['objectrestoreerror'] = 'Fallo al restaurar el evento anterior';
 $messages['bookdeleteconfirm']  = 'Confirme que desea eliminar la libreta de direcciones y todos los contactos en ella';
 $messages['bookdeleting'] = 'Eliminando libreta de direcciones...';
 $messages['booksaving'] = 'Guardando libreta de direcciones...';
diff --git a/plugins/kolab_addressbook/localization/es_ES.inc b/plugins/kolab_addressbook/localization/es_ES.inc
index 7e7d607d..09213799 100644
--- a/plugins/kolab_addressbook/localization/es_ES.inc
+++ b/plugins/kolab_addressbook/localization/es_ES.inc
@@ -7,9 +7,60 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
 $labels['initials'] = 'Iniciales';
+$labels['profession'] = 'Profesión';
+$labels['officelocation'] = 'Ubicación de la oficina';
+$labels['children'] = 'Niños';
+$labels['pgppublickey'] = 'Llave pública PGP';
+$labels['pkcs7publickey'] = 'Llave pública S/MIME';
+$labels['freebusyurl'] = 'URL Fee-busy';
+$labels['typebusiness'] = 'Negocio';
+$labels['typebusinessfax'] = 'Fax del negocio';
 $labels['typecompany'] = 'Compania';
+$labels['typeprimary'] = 'Principal';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Radio';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Devolución de llamada';
 $labels['settings'] = 'Servicios';
+$labels['bookcreate'] = 'Crear libreta de direcciones';
+$labels['bookedit'] = 'Editar libreta de direcciones';
+$labels['bookdelete'] = 'Borrar libreta de direcciones';
 $labels['bookremove'] = 'Remove from list';
+$labels['bookproperties'] = 'Propiedades de la libreta de direcciones';
+$labels['bookname'] = 'Nombre de la libreta';
+$labels['parentbook'] = 'Libreta superior';
+$labels['bookshowurl'] = 'Mostrar URL CardDAV';
+$labels['carddavurldescription'] = 'Copie esta dirección <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank"> CardDAV </a> en una aplicación de cliente para sincronizar totalmente esta libreta de direcciones específica con su ordenador o dispositivo móvil .';
+$labels['addressbookprio'] = 'Selección/comportamiento de la libreta de direcciones';
+$labels['personalfirst'] = 'Libreta de direcciones personal primero';
+$labels['globalfirst'] = 'Libreta de direcciones global primero';
+$labels['personalonly'] = 'Libreta de direcciones personal solo';
+$labels['globalonly'] = 'Libreta de direcciones global solo';
 $labels['searchterms'] = 'Search terms';
+$labels['listsearchresults'] = 'Libreta de direcciones adicional';
+$labels['foldersearchform'] = 'Formulario de búsqueda de la libreta de direcciones';
 $labels['foldersubscribe'] = 'List permanently';
+$labels['nraddressbooksfound'] = '$nr libreta de direcciones encontradas';
+$labels['noaddressbooksfound'] = 'No se han encontrado libreta de direcciones';
+$labels['showhistory'] = 'Mostrar historial';
+$labels['objectchangelog'] = 'Cambiar historial';
+$labels['objectdiff'] = 'Cambiar de $rev1 a $rev2';
+$labels['revisionrestoreconfirm'] = '¿Realmente desea restaurar la revisión $rev de este contacto? Esto reemplazará el contacto actual con la antigua versión.';
+$labels['objectnotfound'] = 'No pudo cargarse los datos de contacto';
+$labels['objectchangelognotavailable'] = 'El historial de cambios no está disponible para este contacto';
+$labels['objectdiffnotavailable'] = 'No hay comparación posible que las revisiones seleccionadas';
+$labels['objectrestoresuccess'] = 'Revisión $rev restaurado correctamente';
+$labels['objectrestoreerror'] = 'No se pudo restaurar la revisión antigua';
+$messages['bookdeleteconfirm']  = '¿Está seguro de eliminar esta libreta de direcciones y todas sus contactos?';
+$messages['bookdeleting'] = 'Borrando libreta de direcciones...';
+$messages['booksaving'] = 'Guardando libreta de direcciones...';
+$messages['bookdeleted'] = 'Se ha eliminado la libreta de direcciones con éxito.';
+$messages['bookupdated'] = 'Se ha cargado la libreta de direcciones con éxito.';
+$messages['bookcreated'] = 'Se ha creado la libreta de direcciones con éxito.';
+$messages['bookdeleteerror'] = 'Se ha producido un error durante la eliminación de la libreta de direcciones.';
+$messages['bookupdateerror'] = 'Se ha producido un error durante la actualización de la libreta de direcciones.';
+$messages['bookcreateerror'] = 'Se ha producido un error durante la creación de la libreta de direcciones.';
+$messages['nobooknamewarning'] = 'Introducir un nombre para la libreta de direcciones';
+$messages['noemailnamewarning'] = 'Introduzca una dirección de correo electrónico o nombre de contacto';
 ?>
diff --git a/plugins/kolab_addressbook/localization/et_EE.inc b/plugins/kolab_addressbook/localization/et_EE.inc
index 9edbffa2..a3a4ac75 100644
--- a/plugins/kolab_addressbook/localization/et_EE.inc
+++ b/plugins/kolab_addressbook/localization/et_EE.inc
@@ -6,7 +6,39 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
-$labels['bookremove'] = 'Remove from list';
-$labels['searchterms'] = 'Search terms';
-$labels['foldersubscribe'] = 'List permanently';
+$labels['initials'] = 'Initsiaalid';
+$labels['profession'] = 'Eriala';
+$labels['officelocation'] = 'Kontori asukoht';
+$labels['children'] = 'Lapsed';
+$labels['pgppublickey'] = 'PGP avalik võti';
+$labels['pkcs7publickey'] = 'S/MIME avalik võti';
+$labels['freebusyurl'] = 'Vaba-Hõivatud URL';
+$labels['typebusiness'] = 'Ettevõte';
+$labels['typebusinessfax'] = 'Ettevõtte faks';
+$labels['typecompany'] = 'Ettevõte';
+$labels['typeprimary'] = 'Peamine';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Radio';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Tagasihelistamine';
+$labels['settings'] = 'Seaded';
+$labels['bookcreate'] = 'Loo aadressiraamat';
+$labels['bookedit'] = 'Muuda aadressiraamatut';
+$labels['bookdelete'] = 'Kustuta aadressiraamat';
+$labels['bookremove'] = 'Eemalda nimekirjast';
+$labels['bookproperties'] = 'Aadressiraamatu omadused';
+$labels['bookname'] = 'Raamatu nimi';
+$labels['parentbook'] = 'Peamine raamat';
+$labels['bookshowurl'] = 'Näita CardDAV URL-i';
+$labels['showhistory'] = 'Näita ajalugu';
+$labels['objectchangelog'] = 'Muuda ajalugu';
+$labels['objectdiff'] = 'Muudatused versioonide $rev1 ja $rev2 vahel';
+$messages['bookdeleting'] = 'Aadressiraamatu kustutamine...';
+$messages['booksaving'] = 'Aadressiraamatu salvestamine...';
+$messages['bookdeleted'] = 'Aadressiraamat on kustutatud.';
+$messages['bookupdated'] = 'Aadressiraamatut on uuendatud.';
+$messages['bookcreated'] = 'Aadressiraamat on loodud.';
+$messages['nobooknamewarning'] = 'Palun sisesta aadressiraamatu nimi.';
+$messages['noemailnamewarning'] = 'Palun sisesta e-posti aadress või kontakti nimi.';
 ?>
diff --git a/plugins/kolab_addressbook/localization/fi_FI.inc b/plugins/kolab_addressbook/localization/fi_FI.inc
index fc3d6fba..ea51c5f5 100644
--- a/plugins/kolab_addressbook/localization/fi_FI.inc
+++ b/plugins/kolab_addressbook/localization/fi_FI.inc
@@ -32,13 +32,22 @@ $labels['personalfirst'] = 'Henkilökohtainen osoitekirja ensin';
 $labels['globalfirst'] = 'Yleinen osoitekirja ensin';
 $labels['personalonly'] = 'Pelkkä henkilökohtainen osoitekirja';
 $labels['globalonly'] = 'Pelkkä yleinen osoitekirja';
-$labels['findaddressbooks'] = 'Etsi osoitekirjoja';
+$labels['findaddressbooks'] = 'Etsi osoitekirjoja...';
 $labels['searchterms'] = 'Hakuehdot';
 $labels['listsearchresults'] = 'Lisäosoitekirjat';
 $labels['foldersearchform'] = 'Osoitekirjan hakulomake';
 $labels['foldersubscribe'] = 'Luetteloi pysyvästi';
 $labels['nraddressbooksfound'] = '$nr osoitekirjaa löytyi';
 $labels['noaddressbooksfound'] = 'Osoitekirjoja ei löytynyt';
+$labels['showhistory'] = 'Näytä historia';
+$labels['objectchangelog'] = 'Muutoshistoria';
+$labels['objectdiff'] = 'Muutokset versiosta $rev1 versioon $rev2';
+$labels['revisionrestoreconfirm'] = 'Haluatko palauttaa tämän yhteystiedon version $rev? Tämä toimenpide korvaa nykyisen yhteystiedon vanhalla versiolla.';
+$labels['objectnotfound'] = 'Yhteystiedon lataaminen epäonnistui';
+$labels['objectchangelognotavailable'] = 'Muutoshistoria ei ole käytettävissä tämän yhteystiedon kohdalla';
+$labels['objectdiffnotavailable'] = 'Valituille versioille ei ole mahdollista tehdä vertailua';
+$labels['objectrestoresuccess'] = 'Versio $rev palautettu onnistuneesti';
+$labels['objectrestoreerror'] = 'Vanhan version palauttaminen epäonnistui';
 $messages['bookdeleteconfirm']  = 'Haluatko varmasti poistaa valitun osoitekirjan ja siinä olevat yhteystiedot?';
 $messages['bookdeleting'] = 'Poistetaan osoitekirja...';
 $messages['booksaving'] = 'Tallennetaan osoitekirjaa...';
diff --git a/plugins/kolab_addressbook/localization/fr_FR.inc b/plugins/kolab_addressbook/localization/fr_FR.inc
index dc436ee5..22300028 100644
--- a/plugins/kolab_addressbook/localization/fr_FR.inc
+++ b/plugins/kolab_addressbook/localization/fr_FR.inc
@@ -9,12 +9,12 @@
 $labels['initials'] = 'Initiales';
 $labels['profession'] = 'Profession';
 $labels['officelocation'] = 'Emplacement du bureau';
-$labels['children'] = 'Enfant';
+$labels['children'] = 'Enfants';
 $labels['pgppublickey'] = 'Clé publique PGP';
 $labels['pkcs7publickey'] = 'Clé publique S/MIME';
-$labels['freebusyurl'] = 'URL Disponible/Occupé';
+$labels['freebusyurl'] = 'URL disponible/occupé';
 $labels['typebusiness'] = 'Travail';
-$labels['typebusinessfax'] = 'Fax Travail';
+$labels['typebusinessfax'] = 'Fax travail';
 $labels['typecompany'] = 'Société';
 $labels['typeprimary'] = 'Principal';
 $labels['typetelex'] = 'Télex';
@@ -23,36 +23,44 @@ $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
 $labels['typecallback'] = 'Rappel';
 $labels['settings'] = 'Paramètres';
-$labels['bookcreate'] = 'Créer un carnet d\'adresse';
-$labels['bookedit'] = 'Modifier un carnet d\'adresse';
-$labels['bookdelete'] = 'Supprimer un carnet d\'adresse';
-$labels['bookremove'] = 'supprimer de la liste';
-$labels['bookproperties'] = 'Propriétés du carnet d\'adresse';
+$labels['bookcreate'] = 'Créer un carnet d\'adresses';
+$labels['bookedit'] = 'Modifier un carnet d\'adresses';
+$labels['bookdelete'] = 'Supprimer un carnet d\'adresses';
+$labels['bookremove'] = 'Supprimer de la liste';
+$labels['bookproperties'] = 'Propriétés du carnet d\'adresses';
 $labels['bookname'] = 'Nom du carnet';
 $labels['parentbook'] = 'Carnet parent';
 $labels['bookshowurl'] = 'Afficher l\'URL CardDAV';
-$labels['carddavurldescription'] = 'Copiez cette adresse vers une application client compatible <a href="http://fr.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> pour synchroniser ce carnet d\'adresse avec votre ordinateur ou votre smartphone.';
+$labels['carddavurldescription'] = 'Copiez cette adresse dans une application client compatible <a href="http://fr.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> pour synchroniser ce carnet d\'adresses avec votre ordinateur ou votre smartphone.';
 $labels['addressbookprio'] = 'Sélection du(des) carnet(s) d\'adresses/comportement';
-$labels['personalfirst'] = 'Carnet(s) d\'adresse personnel en premier';
-$labels['globalfirst'] = 'Carnet(s) d\'adresse global(aux) en premier';
-$labels['personalonly'] = 'Carnet(s) d\'adresse personnel seulement';
+$labels['personalfirst'] = 'Carnet(s) d\'adresses personnel(s) en premier';
+$labels['globalfirst'] = 'Carnet(s) d\'adresses global(aux) en premier';
+$labels['personalonly'] = 'Carnet(s) d\'adresses personnel(s) seulement';
 $labels['globalonly'] = 'Carnet(s) d\'adresse global(aux) seulement';
-$labels['findaddressbooks'] = 'trouver carnets d\'adresse';
 $labels['searchterms'] = 'Critères de recherche';
 $labels['listsearchresults'] = 'Carnets d\'adresses supplémentaires';
-$labels['foldersearchform'] = 'Critères de recherche de carnet d\'adresse';
+$labels['foldersearchform'] = 'Formulaire de recherche carnet d\'adresses';
 $labels['foldersubscribe'] = 'Lister définitivement';
-$labels['nraddressbooksfound'] = '$nr carnet d\'adresses trouvés';
-$labels['noaddressbooksfound'] = 'Aucun carnet d\'adresses trouvés';
-$messages['bookdeleteconfirm']  = 'Voulez-vous vraiment supprimer le carnet d\'adresse sélectionné et tous ses contacts?';
-$messages['bookdeleting'] = 'Suppression du carnet d\'adresse...';
-$messages['booksaving'] = 'Enregistrement du carnet d\'adresse...';
-$messages['bookdeleted'] = 'Carnet d\'adresse supprimé.';
-$messages['bookupdated'] = 'Carnet d\'adresse modifié.';
-$messages['bookcreated'] = 'Carnet d\'adresse créé.';
-$messages['bookdeleteerror'] = 'Une erreur est survenue lors de la suppression du carnet d\'adresse.';
-$messages['bookupdateerror'] = 'Une erreur est survenue lors de la modification du carnet d\'adresse.';
-$messages['bookcreateerror'] = 'Une erreur est survenue lors de la création du carnet d\'adresse.';
-$messages['nobooknamewarning'] = 'Merci de saisir un nom pour le carnet d\'adresse';
+$labels['nraddressbooksfound'] = '$nr carnets d\'adresses trouvés';
+$labels['noaddressbooksfound'] = 'Aucun carnet d\'adresses trouvé';
+$labels['showhistory'] = 'Montrer l\'historique';
+$labels['objectchangelog'] = 'Historique des modifications';
+$labels['objectdiff'] = 'Modifications de $rev1 à $rev2';
+$labels['revisionrestoreconfirm'] = 'Souhaitez-vous restaurer la révision $rev  de ce contrat ? Cela remplacera le contrat actuel par l\'ancienne version.';
+$labels['objectnotfound'] = 'Échec de chargement des données de contact';
+$labels['objectchangelognotavailable'] = 'L\'historique des changements n\'est pas disponible pour ce contrat';
+$labels['objectdiffnotavailable'] = 'La comparaison des versions sélectionnées est impossible';
+$labels['objectrestoresuccess'] = 'La révision $rev a été restaurée avec succès';
+$labels['objectrestoreerror'] = 'Échec lors de la restauration de la précédente révision';
+$messages['bookdeleteconfirm']  = 'Voulez-vous vraiment supprimer le carnet d\'adresses sélectionné et tous ses contacts ?';
+$messages['bookdeleting'] = 'Suppression du carnet d\'adresses...';
+$messages['booksaving'] = 'Enregistrement du carnet d\'adresses...';
+$messages['bookdeleted'] = 'Carnet d\'adresses supprimé.';
+$messages['bookupdated'] = 'Carnet d\'adresses modifié.';
+$messages['bookcreated'] = 'Carnet d\'adresses créé.';
+$messages['bookdeleteerror'] = 'Une erreur est survenue lors de la suppression du carnet d\'adresses.';
+$messages['bookupdateerror'] = 'Une erreur est survenue lors de la modification du carnet d\'adresses.';
+$messages['bookcreateerror'] = 'Une erreur est survenue lors de la création du carnet d\'adresses.';
+$messages['nobooknamewarning'] = 'Merci de saisir un nom pour le carnet d\'adresses';
 $messages['noemailnamewarning'] = 'Merci de saisir une adresse de courriel ou un nom de contact.';
 ?>
diff --git a/plugins/kolab_addressbook/localization/he_IL.inc b/plugins/kolab_addressbook/localization/he_IL.inc
new file mode 100644
index 00000000..2b0438bc
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/he_IL.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+?>
diff --git a/plugins/kolab_addressbook/localization/hr_HR.inc b/plugins/kolab_addressbook/localization/hr_HR.inc
new file mode 100644
index 00000000..36d9e605
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/hr_HR.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['bookremove'] = 'Remove from list';
+$labels['searchterms'] = 'Search terms';
+$labels['foldersubscribe'] = 'List permanently';
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+?>
diff --git a/plugins/kolab_addressbook/localization/it_IT.inc b/plugins/kolab_addressbook/localization/it_IT.inc
index 2352c9d7..645d5d54 100644
--- a/plugins/kolab_addressbook/localization/it_IT.inc
+++ b/plugins/kolab_addressbook/localization/it_IT.inc
@@ -37,13 +37,14 @@ $labels['personalfirst'] = 'Usa prima rubrica/che personale/i';
 $labels['globalfirst'] = 'Usa prima rubrica/che globale/i';
 $labels['personalonly'] = 'Usa solo rubrica/che personale/i';
 $labels['globalonly'] = 'Usa solo rubrica/che globale/i';
-$labels['findaddressbooks'] = 'Torva rubrica';
 $labels['searchterms'] = 'Cerca elemento';
 $labels['listsearchresults'] = 'Rubriche aggiuntive';
 $labels['foldersearchform'] = 'Modulo ricerca rubrica';
 $labels['foldersubscribe'] = 'Elenca sempre';
 $labels['nraddressbooksfound'] = 'trovate $nr rubriche';
 $labels['noaddressbooksfound'] = 'Nessuna rubrica trovata';
+$labels['objectchangelog'] = 'Storico modifiche';
+$labels['objectdiffnotavailable'] = 'Nessun confronto possibile tra le revisioni selezionate';
 $messages['bookdeleteconfirm']  = 'Vuoi veramente eliminare la rubrica selezionata con tutti i contatti attualmente presenti?';
 $messages['bookdeleting'] = 'Eliminazione rubrica...';
 $messages['booksaving'] = 'Salvataggio rubrica...';
diff --git a/plugins/kolab_addressbook/localization/ja_JP.inc b/plugins/kolab_addressbook/localization/ja_JP.inc
index 16e886d7..fa23983e 100644
--- a/plugins/kolab_addressbook/localization/ja_JP.inc
+++ b/plugins/kolab_addressbook/localization/ja_JP.inc
@@ -10,8 +10,8 @@ $labels['initials'] = 'イニシャル';
 $labels['profession'] = '職業';
 $labels['officelocation'] = '会社所在';
 $labels['children'] = '子供';
-$labels['pgppublickey'] = 'PGP パブリックキー';
-$labels['pkcs7publickey'] = 'S/MIME パブリックキー';
+$labels['pgppublickey'] = 'PGP 公開鍵';
+$labels['pkcs7publickey'] = 'S/MIME 公開鍵';
 $labels['freebusyurl'] = '空き状況 URL';
 $labels['typebusiness'] = '仕事';
 $labels['typebusinessfax'] = '仕事 Fax';
@@ -30,13 +30,25 @@ $labels['bookremove'] = 'Remove from list';
 $labels['bookproperties'] = 'アドレス帳設定';
 $labels['bookname'] = 'ブック名';
 $labels['parentbook'] = '上位ブック';
+$labels['bookshowurl'] = 'CardDAV URL表示';
+$labels['carddavurldescription'] = 'この指定されたアドレス帳を全て同期するためには <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> クライアントアプリケーションへこのアドレスをコピーしてください。';
 $labels['addressbookprio'] = 'アドレス帳(s)セレクション/動作';
 $labels['personalfirst'] = '個人アドレス帳(s) を前に';
 $labels['globalfirst'] = 'グローバルアドレス帳(s) を前に';
 $labels['personalonly'] = '個人アドレス帳(s) のみ';
 $labels['globalonly'] = 'グローバルアドレス帳(s) のみ';
-$labels['searchterms'] = 'Search terms';
-$labels['foldersubscribe'] = 'List permanently';
+$labels['searchterms'] = '検索単語';
+$labels['listsearchresults'] = '追加アドレス帳';
+$labels['foldersearchform'] = 'アドレス帳検索フォーム';
+$labels['foldersubscribe'] = '継続的リスト';
+$labels['nraddressbooksfound'] = '$nr アドレス帳が見つかりました';
+$labels['noaddressbooksfound'] = 'アドレス帳は見つかりませんでした';
+$labels['showhistory'] = '履歴表示';
+$labels['objectchangelog'] = '変更履歴';
+$labels['objectdiff'] = '$rev1 から $rev2 への変更';
+$labels['objectdiffnotavailable'] = '選択されたリビジョンでは比較できません';
+$labels['objectrestoresuccess'] = 'リビジョン $rev は復旧されました';
+$labels['objectrestoreerror'] = '古いバージョンの復旧に失敗しました';
 $messages['bookdeleteconfirm']  = '本当に選択したアドレス帳およびそのデータをすべて削除しますか?';
 $messages['bookdeleting'] = 'アドレス帳を削除中...';
 $messages['booksaving'] = 'アドレス帳を保存中…';
diff --git a/plugins/kolab_addressbook/localization/ko_KR.inc b/plugins/kolab_addressbook/localization/ko_KR.inc
new file mode 100644
index 00000000..bad2e9f1
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/ko_KR.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['bookremove'] = '목록에서 삭제';
+$labels['objectrestoreerror'] = '이전 버전으로 복구하지 못하였습니다';
+?>
diff --git a/plugins/kolab_addressbook/localization/lv.inc b/plugins/kolab_addressbook/localization/lv.inc
new file mode 100644
index 00000000..811c8cfb
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/lv.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['bookremove'] = 'Dzēst no saraksta';
+$labels['searchterms'] = 'Meklēšanas nosacījumi';
+$labels['foldersubscribe'] = 'Rādīt sarakstā vienmēr';
+$labels['objectchangelog'] = 'Mainīt vēsturi';
+$labels['objectdiff'] = 'Izmaiņas no $rev1 uz $rev2';
+$labels['objectdiffnotavailable'] = 'Izvēlētās versijas nav salīdzināmas';
+$labels['objectrestoresuccess'] = 'Versija $rev veiksmīgi atjaunota';
+$labels['objectrestoreerror'] = 'Kļūda atjaunojot veco versiju';
+$messages['nobooknamewarning'] = 'Lūdzu, ievadiet adrešu grāmatas nosaukumu.';
+$messages['noemailnamewarning'] = 'Lūdzu, ievadiet e-pasta adresi vai kontaktpersonas vārdu.';
+?>
diff --git a/plugins/kolab_addressbook/localization/nl_NL.inc b/plugins/kolab_addressbook/localization/nl_NL.inc
index a7681aff..423d1aed 100644
--- a/plugins/kolab_addressbook/localization/nl_NL.inc
+++ b/plugins/kolab_addressbook/localization/nl_NL.inc
@@ -10,44 +10,57 @@ $labels['initials'] = 'Initialen';
 $labels['profession'] = 'Beroep';
 $labels['officelocation'] = 'Kantoorlocatie';
 $labels['children'] = 'Kinderen';
-$labels['pgppublickey'] = 'PGP publieke sleutel';
-$labels['pkcs7publickey'] = 'S/MIME publieke sleutel';
-$labels['freebusyurl'] = 'Vrij/Bezet URL';
+$labels['pgppublickey'] = 'Openbare PGP-sleutel';
+$labels['pkcs7publickey'] = 'Openbare S/MIME-sleutel';
+$labels['freebusyurl'] = 'URL Beschikbaar/Bezet';
 $labels['typebusiness'] = 'Zakelijk';
-$labels['typebusinessfax'] = 'Zakelijk (Fax)';
-$labels['typecompany'] = 'Bedrijfsnaam';
+$labels['typebusinessfax'] = 'Fax op werk';
+$labels['typecompany'] = 'Bedrijf';
 $labels['typeprimary'] = 'Primair';
 $labels['typetelex'] = 'Telex';
 $labels['typeradio'] = 'Radio';
 $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
+$labels['typecallback'] = 'Terugbellen';
 $labels['settings'] = 'Instellingen';
-$labels['bookcreate'] = 'Maak adresboek aan';
-$labels['bookedit'] = 'Wijzig adresboek';
+$labels['bookcreate'] = 'Adresboek maken';
+$labels['bookedit'] = 'Adresboek bewerken';
 $labels['bookdelete'] = 'Adresboek verwijderen';
-$labels['bookremove'] = 'Remove from list';
-$labels['bookproperties'] = 'Eigenschappen voor adresboek';
-$labels['bookname'] = 'Adresboek naam';
-$labels['parentbook'] = 'Toevoegen aan bestaand adresboek';
-$labels['bookshowurl'] = 'Toon CardDAV URL';
-$labels['carddavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> programma om het volledige adresboek te synchroniseren met uw computer of mobiel apparaat.';
-$labels['addressbookprio'] = 'Gedrag voor adresboek(en)-selectie';
-$labels['personalfirst'] = 'Eerst persoonlijke adresboek(en)';
-$labels['globalfirst'] = 'Eerst globale adresboek(en)';
-$labels['personalonly'] = 'Alleen persoonlijke adresboek(en)';
-$labels['globalonly'] = 'Alleen globale adresboek(en)';
-$labels['searchterms'] = 'Search terms';
-$labels['foldersubscribe'] = 'Permanent weergeven';
-$messages['bookdeleteconfirm']  = 'Weet u zeker dat u het geselecteerde adresboek inclusief inhoud wilt verwijderen?';
-$messages['bookdeleting'] = 'Adresboek aan het verwijderen...';
-$messages['booksaving'] = 'Adresboek aan het opslaan...';
-$messages['bookdeleted'] = 'Adresboek succesvol verwijderd.';
-$messages['bookupdated'] = 'Adresboek succesvol gewijzigd.';
-$messages['bookcreated'] = 'Adresboek succesvol aangemaakt.';
-$messages['bookdeleteerror'] = 'Er heeft zich een fout voorgedaan bij het verwijderen van het adresboek.';
-$messages['bookupdateerror'] = 'Er heeft zich een fout voorgedaan bij het wijzigen van het adresboek.';
-$messages['bookcreateerror'] = 'Er heeft zich een fout voorgedaan bij het aanmaken van het adresboek.';
-$messages['nobooknamewarning'] = 'Voer een naam voor het adresboek in, a.u.b.';
-$messages['noemailnamewarning'] = 'Voor een e-mail adres of contactnaam in, a.u.b.';
+$labels['bookremove'] = 'Verwijderen uit lijst';
+$labels['bookproperties'] = 'Adresboekeigenschappen';
+$labels['bookname'] = 'Adresboeknaam';
+$labels['parentbook'] = 'Primair adresboek';
+$labels['bookshowurl'] = 'CardDAV-URL tonen';
+$labels['carddavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-client om dit specifieke adresboek volledig te synchroniseren met uw computer of mobiele apparaat.';
+$labels['addressbookprio'] = 'Selectie/gedrag van adresboek(en)';
+$labels['personalfirst'] = 'Eerst persoonlijke adresboeken';
+$labels['globalfirst'] = 'Eerst algemene adresboeken';
+$labels['personalonly'] = 'Alleen persoonlijke adresboeken';
+$labels['globalonly'] = 'Alleen algemene adresboeken';
+$labels['searchterms'] = 'Zoektermen';
+$labels['listsearchresults'] = 'Extra adresboeken';
+$labels['foldersearchform'] = 'Zoekformulier voor adresboeken';
+$labels['foldersubscribe'] = 'Definitief weergeven';
+$labels['nraddressbooksfound'] = '$nr adresboeken gevonden';
+$labels['noaddressbooksfound'] = 'Geen adresboeken gevonden';
+$labels['showhistory'] = 'Geschiedenis tonen';
+$labels['objectchangelog'] = 'Geschiedenis wijzigen';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
+$labels['revisionrestoreconfirm'] = 'Weet u zeker dat u revisie $rev van deze contactpersoon wilt herstellen? Met deze actie vervangt u de huidige contactpersoon door de oude versie.';
+$labels['objectnotfound'] = 'Laden van contactpersoonsgegevens is mislukt';
+$labels['objectchangelognotavailable'] = 'Voor deze contactpersoon kunt u de geschiedenis niet wijzigen';
+$labels['objectdiffnotavailable'] = 'Geen vergelijking mogelijk voor de geselecteerde revisies';
+$labels['objectrestoresuccess'] = 'Revisie $rev met succes hersteld';
+$labels['objectrestoreerror'] = 'Herstellen van oude revisie is mislukt';
+$messages['bookdeleteconfirm']  = 'Weet u zeker dat u het geselecteerde adresboek en alle contactpersonen erin wilt verwijderen?';
+$messages['bookdeleting'] = 'Adresboek verwijderen...';
+$messages['booksaving'] = 'Adresboek opslaan...';
+$messages['bookdeleted'] = 'Adresboek is met succes verwijderd.';
+$messages['bookupdated'] = 'Adresboek is met succes bijgewerkt.';
+$messages['bookcreated'] = 'Adresboek is met succes gemaakt.';
+$messages['bookdeleteerror'] = 'Er is een fout opgetreden tijdens de verwijdering van het adresboek.';
+$messages['bookupdateerror'] = 'Er is een fout opgetreden tijdens het bijwerken van het adresboek.';
+$messages['bookcreateerror'] = 'Er is een fout opgetreden tijdens het maken van het adresboek.';
+$messages['nobooknamewarning'] = 'Voer een naam voor het adresboek in.';
+$messages['noemailnamewarning'] = 'Voor een e-mailadres of een naam van een contactpersoon in.';
 ?>
diff --git a/plugins/kolab_addressbook/localization/pl_PL.inc b/plugins/kolab_addressbook/localization/pl_PL.inc
index bacfd75a..2d19ea0e 100644
--- a/plugins/kolab_addressbook/localization/pl_PL.inc
+++ b/plugins/kolab_addressbook/localization/pl_PL.inc
@@ -6,53 +6,12 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
-$labels['initials'] = 'Inicjały';
-$labels['profession'] = 'Zawód';
-$labels['officelocation'] = 'Biuro';
-$labels['children'] = 'Dzieci';
-$labels['pgppublickey'] = 'Klucz publiczny PGP';
-$labels['pkcs7publickey'] = 'Klucz publiczny S/MIME';
-$labels['freebusyurl'] = 'Adres URL free-busy';
-$labels['typebusiness'] = 'Firmowy';
-$labels['typebusinessfax'] = 'Fax firmowy';
-$labels['typecompany'] = 'Firma';
-$labels['typeprimary'] = 'Główny';
-$labels['typetelex'] = 'Teleks';
-$labels['typeradio'] = 'Radiowy';
-$labels['typeisdn'] = 'ISDN';
-$labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
-$labels['settings'] = 'Ustawienia';
-$labels['bookcreate'] = 'Utwórz książkę adresową';
-$labels['bookedit'] = 'Edytuj książkę adresową';
-$labels['bookdelete'] = 'Usuń książkę adresową';
-$labels['bookremove'] = 'Remove from list';
-$labels['bookproperties'] = 'Właściwości książki adresowej';
-$labels['bookname'] = 'Nazwa książki';
-$labels['parentbook'] = 'Nadrzędna książka';
-$labels['bookshowurl'] = 'Pokaż adres URL CardDAV';
-$labels['carddavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> aby zsynchronizować książkę adresową z twoim komputerem lub urządzeniem przenośnym.';
-$labels['addressbookprio'] = 'Wybór/zachowanie książek adresowych';
-$labels['personalfirst'] = 'najpierw prywatne książki adresowe';
-$labels['globalfirst'] = 'najpierw globalne książki adresowe';
-$labels['personalonly'] = 'tylko prywatne książki adresowe';
-$labels['globalonly'] = 'tylko globalne książki adresowe';
-$labels['findaddressbooks'] = 'Wyszukaj książki adresowe';
+$labels['bookremove'] = 'Usuń z listy';
 $labels['searchterms'] = 'Szukana fraza';
-$labels['listsearchresults'] = 'Dodatkowe książki adresowe';
-$labels['foldersearchform'] = 'Formularz wyszukiwania książek adresowych';
 $labels['foldersubscribe'] = 'Dodaj do listy na stałe';
-$labels['nraddressbooksfound'] = 'znaleziono $nr książkek adresowych';
-$labels['noaddressbooksfound'] = 'Nie znaleziono żadnych książek adresowych';
-$messages['bookdeleteconfirm']  = 'Czy na pewno chcesz usunąć wybraną książkę i wszystkie kontakty?';
-$messages['bookdeleting'] = 'Usuwanie książki adresowej...';
-$messages['booksaving'] = 'Zapisywanie książki adresowej...';
-$messages['bookdeleted'] = 'Książka adresowa została usunięta.';
-$messages['bookupdated'] = 'Książka adresowa została zaktualizowana.';
-$messages['bookcreated'] = 'Książka adresowa została utworzona.';
-$messages['bookdeleteerror'] = 'Podczas usuwania książki adresowej wystąpił błąd.';
-$messages['bookupdateerror'] = 'Podczas zapisywania książki adresowej wystąpił błąd.';
-$messages['bookcreateerror'] = 'Podczas dodawania książki adresowej wystąpił błąd.';
-$messages['nobooknamewarning'] = 'Proszę podać nazwę książki adresowej.';
-$messages['noemailnamewarning'] = 'Proszę podać adres email lub nazwę kontaktu.';
+$labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
+$labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
 ?>
diff --git a/plugins/kolab_addressbook/localization/pt_BR.inc b/plugins/kolab_addressbook/localization/pt_BR.inc
index 0bc6d7a1..ba2dd52b 100644
--- a/plugins/kolab_addressbook/localization/pt_BR.inc
+++ b/plugins/kolab_addressbook/localization/pt_BR.inc
@@ -39,6 +39,7 @@ $labels['personalonly'] = 'Catálogo de endereço(s) pessoal apenas';
 $labels['globalonly'] = 'Catálogo(s) de endereço global apenas';
 $labels['searchterms'] = 'Search terms';
 $labels['foldersubscribe'] = 'Listar permanentemente';
+$labels['objectchangelog'] = 'Mudar Histórico';
 $messages['bookdeleteconfirm']  = 'Você realmente gostaria de remover o catálogo de endereços selecionado e todos os contatos que estão dentro dele?';
 $messages['bookdeleting'] = 'Removendo catálogo de endereço...';
 $messages['booksaving'] = 'Salvando catálogo de endereço...';
diff --git a/plugins/kolab_addressbook/localization/pt_PT.inc b/plugins/kolab_addressbook/localization/pt_PT.inc
index ff3754a7..85c77b60 100644
--- a/plugins/kolab_addressbook/localization/pt_PT.inc
+++ b/plugins/kolab_addressbook/localization/pt_PT.inc
@@ -6,7 +6,36 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
+$labels['initials'] = 'Iniciais';
+$labels['profession'] = 'Profissão';
+$labels['officelocation'] = 'Localização de escritório';
+$labels['children'] = 'Criança';
+$labels['pgppublickey'] = 'chave pública GPG';
+$labels['pkcs7publickey'] = 'chave pública S/MIME';
+$labels['freebusyurl'] = 'URL Livre-ocupado ';
+$labels['typebusiness'] = 'Negócio';
+$labels['typebusinessfax'] = 'Fax empresárial';
+$labels['typecompany'] = 'Empresa';
+$labels['typeprimary'] = 'Primário';
+$labels['typeradio'] = 'Rádio';
+$labels['typeisdn'] = 'RDSI';
+$labels['settings'] = 'Definições';
+$labels['bookcreate'] = 'Criar contacto';
+$labels['bookedit'] = 'Editar contacto';
+$labels['bookdelete'] = 'Apagar contacto';
 $labels['bookremove'] = 'Remove from list';
+$labels['bookproperties'] = 'Propriedades do contacto';
+$labels['bookname'] = 'Nome do livro';
+$labels['parentbook'] = 'Livro superior';
+$labels['bookshowurl'] = 'Mostrar CardDAV URL';
+$labels['carddavurldescription'] = 'Copie este endereço <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> para uma aplicação cliente para sincronizar totalmente este contacto com o seu computador ou dispositivo móvel.';
+$labels['addressbookprio'] = 'Selecção/comportamento do contacto(s)';
+$labels['personalfirst'] = 'Contacto(s) pessoais primeiro';
 $labels['searchterms'] = 'Search terms';
 $labels['foldersubscribe'] = 'Listar permanentemente';
+$labels['objectchangelog'] = 'Alterar histórico';
+$labels['objectdiff'] = 'Diferenças entre $rev1 e $rev2';
+$labels['objectdiffnotavailable'] = 'Não é possível comparar as versões selecionadas';
+$labels['objectrestoresuccess'] = 'A versão $rev foi reposta com sucesso.';
+$labels['objectrestoreerror'] = 'Não foi possível repor a versão anterior.';
 ?>
diff --git a/plugins/kolab_addressbook/localization/ru_RU.inc b/plugins/kolab_addressbook/localization/ru_RU.inc
index f1a17e3c..dc6cfd0a 100644
--- a/plugins/kolab_addressbook/localization/ru_RU.inc
+++ b/plugins/kolab_addressbook/localization/ru_RU.inc
@@ -37,13 +37,21 @@ $labels['personalfirst'] = 'Персональные адресные книги
 $labels['globalfirst'] = 'Глобальные адресные книги в начале';
 $labels['personalonly'] = 'Только персональные адресные книги';
 $labels['globalonly'] = 'Только глобальные адресные книги';
-$labels['findaddressbooks'] = 'Найти адресные книги';
 $labels['searchterms'] = 'Условия поиска';
 $labels['listsearchresults'] = 'Дополнительные адресные книги';
 $labels['foldersearchform'] = 'Форма поиска адресных книг';
 $labels['foldersubscribe'] = 'Всегда показывать';
 $labels['nraddressbooksfound'] = '$nr адресных книг найдено';
 $labels['noaddressbooksfound'] = 'Адресных книг не найдено';
+$labels['showhistory'] = 'Показать Историю';
+$labels['objectchangelog'] = 'История изменений';
+$labels['objectdiff'] = 'Изменения с $rev1 до $rev2';
+$labels['revisionrestoreconfirm'] = 'Вы уверенны, что хотите восстановить этот контакт из ревизии $rev? Он заменит текущее контакт старой версией. ';
+$labels['objectnotfound'] = 'Не удалось загрузить информацию о контакте';
+$labels['objectchangelognotavailable'] = 'История изменений для этого контакта недоступна';
+$labels['objectdiffnotavailable'] = 'Невозможно провести сравнение выбранных ревизий ';
+$labels['objectrestoresuccess'] = 'Ревизия $rev успешно восстановлена';
+$labels['objectrestoreerror'] = 'Не удалось восстановить старую ревизию';
 $messages['bookdeleteconfirm']  = 'Вы действительно хотите удалить выбранную адресную книгу и все контакты в ней?';
 $messages['bookdeleting'] = 'Удаление адресной книги...';
 $messages['booksaving'] = 'Сохранение адресной книги...';
diff --git a/plugins/kolab_addressbook/localization/sk_SK.inc b/plugins/kolab_addressbook/localization/sk_SK.inc
new file mode 100644
index 00000000..3acfaaee
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/sk_SK.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['bookremove'] = 'Odstrániť zo zoznamu';
+?>
diff --git a/plugins/kolab_addressbook/localization/sl_SI.inc b/plugins/kolab_addressbook/localization/sl_SI.inc
new file mode 100644
index 00000000..8f7dcb54
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/sl_SI.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['bookremove'] = 'Odstrani iz seznama';
+$labels['searchterms'] = 'Iskalni pogoji';
+$labels['foldersubscribe'] = 'Označi za vedno';
+$labels['objectchangelog'] = 'Spremeni Zgodovino';
+$labels['objectdiffnotavailable'] = 'Primerjava za izbrane verzije ni na voljo';
+?>
diff --git a/plugins/kolab_addressbook/localization/sv_SE.inc b/plugins/kolab_addressbook/localization/sv_SE.inc
index 9a0184fa..2d20b4a0 100644
--- a/plugins/kolab_addressbook/localization/sv_SE.inc
+++ b/plugins/kolab_addressbook/localization/sv_SE.inc
@@ -6,53 +6,9 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
-$labels['initials'] = 'Initialer';
-$labels['profession'] = 'Yrke';
-$labels['officelocation'] = 'Kontorsadress';
-$labels['children'] = 'Barn';
-$labels['pgppublickey'] = 'Publik PGP-nyckel';
-$labels['pkcs7publickey'] = 'Publik S/MIME-nyckel';
-$labels['freebusyurl'] = 'Ledig-upptagen-URL';
-$labels['typebusiness'] = 'Företag';
-$labels['typebusinessfax'] = 'Företagsfax';
-$labels['typecompany'] = 'Företag';
-$labels['typeprimary'] = 'Primär';
-$labels['typetelex'] = 'Telex';
-$labels['typeradio'] = 'Radio';
-$labels['typeisdn'] = 'ISDN';
-$labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Återuppringning';
-$labels['settings'] = 'Inställningar';
-$labels['bookcreate'] = 'Skapa adressbok';
-$labels['bookedit'] = 'Redigera adressbok';
-$labels['bookdelete'] = 'Ta bort adressbok';
 $labels['bookremove'] = 'Ta bort från lista';
-$labels['bookproperties'] = 'Egenskaper för adressbok';
-$labels['bookname'] = 'Bokens namn';
-$labels['parentbook'] = 'Överordnad bok';
-$labels['bookshowurl'] = 'Visa CardDAV-URL';
-$labels['carddavurldescription'] = 'Kopiera denna adress till ett <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank"> CardDAV</a>-klientprogram för att fullt ut synkronisera denna specifika adressbok med din dator eller mobila enhet .';
-$labels['addressbookprio'] = 'Val/beteenden för adressbok(böcker) ';
-$labels['personalfirst'] = 'Personliga adressböcker först';
-$labels['globalfirst'] = 'Globala adressböcker först';
-$labels['personalonly'] = 'Personliga adressböcker enbart';
-$labels['globalonly'] = 'Globala adressböcker enbart';
-$labels['findaddressbooks'] = 'Hitta adressböcker';
 $labels['searchterms'] = 'Sökord';
-$labels['listsearchresults'] = 'Ytterligare adressböcker';
-$labels['foldersearchform'] = 'Sökformulär för adressböcker';
 $labels['foldersubscribe'] = 'Lista permanent';
-$labels['nraddressbooksfound'] = '$nr adressböcker hittades';
-$labels['noaddressbooksfound'] = 'Inga adressböcker hittades';
-$messages['bookdeleteconfirm']  = 'Vill du verkligen ta bort den valda adressboken och alla kontakter i den?';
-$messages['bookdeleting'] = 'Tar bort adressbok ...';
-$messages['booksaving'] = 'Sparar adressbok ...';
-$messages['bookdeleted'] = 'Adressbok borttagen.';
-$messages['bookupdated'] = 'Adressbok uppdaterad.';
-$messages['bookcreated'] = 'Adressbok skapad.';
-$messages['bookdeleteerror'] = 'Ett fel uppstod vid borttagning av adressbok.';
-$messages['bookupdateerror'] = 'Ett fel uppstod vid uppdatering av adressbok.';
-$messages['bookcreateerror'] = 'Ett fel uppstod vid skapandet av adressbok.';
-$messages['nobooknamewarning'] = 'Vänligen ange adressbokens namn.';
-$messages['noemailnamewarning'] = 'Vänligen ange e-postadress eller kontaktnamn.';
+$labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
 ?>
diff --git a/plugins/kolab_addressbook/localization/th_TH.inc b/plugins/kolab_addressbook/localization/th_TH.inc
new file mode 100644
index 00000000..50bca63a
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/th_TH.inc
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['initials'] = 'ชื่อย่อ';
+$labels['profession'] = 'อาชีพ';
+$labels['officelocation'] = 'สถานที่ที่ทำงาน';
+$labels['pgppublickey'] = 'กุญแจ PGP สาธารณะ';
+$labels['pkcs7publickey'] = 'กุญแจ S/MIME สาธารธะ';
+$labels['freebusyurl'] = 'ลิงค์ ว่าง-ติดธุระ';
+$labels['typebusiness'] = 'ธุรกิจ';
+$labels['typebusinessfax'] = 'โทรสาร ธุรกิจ';
+$labels['typecompany'] = 'บริษัท';
+$labels['typetelex'] = 'เทเลกซ์';
+$labels['typeradio'] = 'วิทยุ';
+$labels['typeisdn'] = 'รหัส ISDN';
+$labels['typecallback'] = 'บริการเรียกกลับ';
+$labels['settings'] = 'การตั้งค่า';
+$labels['bookcreate'] = 'สร้างสมุดรายชื่อ';
+$labels['bookedit'] = 'แก้ไขสมุดรายชื่อ';
+$labels['bookdelete'] = 'ลบสมุดรายชื่อ';
+$labels['bookremove'] = 'ลบออกจากรายชื่อ';
+$labels['bookproperties'] = 'คุณสมบัติของสมุดรายชื่อ';
+$labels['bookname'] = 'ชื่อสมุด';
+$labels['bookshowurl'] = 'แสดงลิงค์ CardDAV';
+$labels['carddavurldescription'] = 'คัดลอกลิงค์ที่อยู่นี้ไปยัง <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> โปรแกรมที่เครื่องลูกข่ายเพื่อซิงค์ข้อมูลในสมุดที่อยู่ฉบับนี้กับคอมพิวเตอร์หรืออุปกรณ์มือถือของท่าน';
+$labels['personalfirst'] = 'สมุดที่อยู่ส่วนตัวก่อน';
+$labels['personalonly'] = 'สมุดที่อยู่ส่วนตัวเท่านั้น';
+$labels['searchterms'] = 'ข้อความที่ต้องการค้นหา';
+$labels['listsearchresults'] = 'สมุดที่อยู่เพิ่มเติม';
+$labels['foldersearchform'] = 'ฟอร์มค้นหาสมุดที่อยู่';
+$labels['foldersubscribe'] = 'แสดงเป็นรายการถาวร';
+$labels['nraddressbooksfound'] = 'พบ สมุดที่อยุ่จำนวน $nr เล่ม';
+$labels['noaddressbooksfound'] = 'ไม่พบสมุดที่อยุ่';
+$labels['objectchangelog'] = 'ประวัติการปรับเปลี่ยน';
+$labels['objectdiffnotavailable'] = 'ไม่สามารถเปรียบเทียบรุ่นการปรับปรุงที่เลือกได้';
+$messages['bookdeleteconfirm']  = 'คุณต้องการลบสมุดที่อยู่ดังกล่าวพร้อมรายชื่อผู้ติดต่อในนั้นหรือ';
+$messages['bookdeleting'] = 'ลบสมุดที่อยู่';
+$messages['booksaving'] = 'บันทึกสมุดที่อยุ่';
+$messages['bookdeleted'] = 'ลบสมุดที่อยู่เรียบร้อยแล้ว';
+$messages['bookupdated'] = 'ปรับปรุงสมุดที่อยู่เรียบร้อยแล้ว';
+$messages['bookcreated'] = 'สร้างสมุดที่อยู่เรียบร้อยแล้ว';
+$messages['bookdeleteerror'] = 'เกิดข้อผิดพลาดในระหว่างลบสมุดที่อยู่';
+$messages['bookupdateerror'] = 'เกิดข้อผิดพลาดในระหว่า่งปรับปรุงสมุดที่อยู่';
+$messages['bookcreateerror'] = 'เกิดข้อผิดพลาดในระหว่างสร้างสมุดที่อยุ่';
+$messages['nobooknamewarning'] = 'กรุณาป้อนชื่อสมุดบันทึกที่อยู่';
+$messages['noemailnamewarning'] = 'กรุณาป้อน อีเมล์ และ ชื่อผู้ติดต่อ';
+?>
diff --git a/plugins/kolab_addressbook/localization/uk_UA.inc b/plugins/kolab_addressbook/localization/uk_UA.inc
new file mode 100644
index 00000000..57240de1
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/uk_UA.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['settings'] = 'Налаштування';
+$labels['bookremove'] = 'Вилучити зі списку';
+$labels['searchterms'] = 'Умови пошуку';
+$labels['foldersubscribe'] = 'Завжди показувати';
+$labels['objectchangelog'] = 'Історія змін';
+?>
diff --git a/plugins/kolab_addressbook/localization/vi_VN.inc b/plugins/kolab_addressbook/localization/vi_VN.inc
new file mode 100644
index 00000000..7d0ae983
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/vi_VN.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiff'] = 'Changes from revisions $rev';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+?>
diff --git a/plugins/kolab_addressbook/localization/zh_CN.inc b/plugins/kolab_addressbook/localization/zh_CN.inc
index 620adf0b..685038d3 100644
--- a/plugins/kolab_addressbook/localization/zh_CN.inc
+++ b/plugins/kolab_addressbook/localization/zh_CN.inc
@@ -6,5 +6,9 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
+$labels['officelocation'] = '办公地点';
+$labels['typecallback'] = '反馈';
+$labels['settings'] = '设置';
 $labels['bookremove'] = '从列表中移除';
+$labels['showhistory'] = '显示历史';
 ?>
diff --git a/plugins/kolab_addressbook/localization/zh_TW.inc b/plugins/kolab_addressbook/localization/zh_TW.inc
new file mode 100644
index 00000000..2b0438bc
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/zh_TW.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+?>
diff --git a/plugins/kolab_addressbook/skins/classic/kolab_addressbook.css b/plugins/kolab_addressbook/skins/classic/kolab_addressbook.css
deleted file mode 100644
index 30b95939..00000000
--- a/plugins/kolab_addressbook/skins/classic/kolab_addressbook.css
+++ /dev/null
@@ -1,49 +0,0 @@
-#directorylistbox ul.treelist li.virtual {
-	background-image: none !important;
-}
-
-#directorylistbox ul.treelist li.virtual > div a {
-	color: #aaa;
-	background-image: none;
-}
-
-#directorylistbox ul.treelist li.virtual > .treetoggle {
-	top: -2px !important;
-}
-
-/*
-#directorylist li.addressbook.readonly
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px 0px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.shared
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -54px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.shared.readonly
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -72px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.other
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -18px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.other.readonly
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -36px;
-  background-repeat: no-repeat;
-}
-*/
\ No newline at end of file
diff --git a/plugins/kolab_addressbook/skins/classic/kolab_folders.gif b/plugins/kolab_addressbook/skins/classic/kolab_folders.gif
deleted file mode 100644
index 3ac6fc48..00000000
Binary files a/plugins/kolab_addressbook/skins/classic/kolab_folders.gif and /dev/null differ
diff --git a/plugins/kolab_addressbook/skins/classic/kolab_folders.png b/plugins/kolab_addressbook/skins/classic/kolab_folders.png
deleted file mode 100644
index 95a192e5..00000000
Binary files a/plugins/kolab_addressbook/skins/classic/kolab_folders.png and /dev/null differ
diff --git a/plugins/kolab_addressbook/skins/classic/templates/audittrail.html b/plugins/kolab_addressbook/skins/classic/templates/audittrail.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/plugins/kolab_addressbook/skins/classic/templates/bookedit.html b/plugins/kolab_addressbook/skins/classic/templates/bookedit.html
deleted file mode 100644
index 717ed8c4..00000000
--- a/plugins/kolab_addressbook/skins/classic/templates/bookedit.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
-<script type="text/javascript" src="/functions.js"></script>
-</head>
-<body class="iframe">
-
-<div id="folder-title" class="boxtitle"><roundcube:label name="kolab_addressbook.bookproperties" /></div>
-
-<div id="folder-details" class="boxcontent">
-  <roundcube:object name="bookdetails" />
-  <p>
-<!--
-    <roundcube:if condition="!strlen(request:_source)" />
-    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
-    <roundcube:endif />
--->
-    <roundcube:button command="book-save" type="input" class="button mainaction" label="save" />
-  </p>
-</div>
-<script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
-
-</body>
-</html>
diff --git a/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html b/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html
new file mode 100644
index 00000000..5f97db4b
--- /dev/null
+++ b/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html
@@ -0,0 +1,143 @@
+<div id="contacthistory" class="popupmenu" aria-hidden="true">
+    <roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
+    <div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="contactdiff" class="popupmenu" aria-hidden="true">
+	<h2 class="contact-names">Contact Name</h2>
+	<h2 class="contact-names-new diff-text-new"></h2>
+
+	<div class="form-section contact-name">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-nickname">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-organization">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-department">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-jobtitle">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-photo">
+		<img class="diff-img-old" /> &#8674;
+		<img class="diff-img-new" />
+	</div>
+
+	<div class="form-section contact-email">
+		<label><roundcube:label name="email" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-phone">
+		<label><roundcube:label name="phone" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-address">
+		<label><roundcube:label name="address" /><span class="index"></span></label>
+		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+
+	<div class="form-section contact-website">
+		<label><roundcube:label name="website" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-im">
+		<label><roundcube:label name="instantmessenger" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-gender">
+		<label><roundcube:label name="gender" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-birthday">
+		<label><roundcube:label name="birthday" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-anniversary">
+		<label><roundcube:label name="anniversary" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-profession">
+		<label><roundcube:label name="profession" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-manager">
+		<label><roundcube:label name="manager" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-assistant">
+		<label><roundcube:label name="assistant" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-spouse">
+		<label><roundcube:label name="spouse" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-children">
+		<label><roundcube:label name="children" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-notes">
+		<label><roundcube:label name="notes" /></label>
+		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+
+	<div class="form-section contact-freebusyurl">
+		<label><roundcube:label name="kolab_addressbook.freebusyurl" /></label>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+
+	<div class="form-section contact-pgppublickey">
+		<label><roundcube:label name="kolab_addressbook.pgppublickey" /></label>
+		<div class="diff-text-old" style="white-space:pre-wrap"></div>
+		<div class="diff-text-new" style="white-space:pre-wrap"></div>
+	</div>
+
+	<div class="form-section contact-pkcs7publickey">
+		<label><roundcube:label name="kolab_addressbook.pkcs7publickey" /></label>
+		<div class="diff-text-old" style="white-space:pre-wrap"></div>
+		<div class="diff-text-new" style="white-space:pre-wrap"></div>
+	</div>
+</div>
diff --git a/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html b/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html
new file mode 100644
index 00000000..790f3875
--- /dev/null
+++ b/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html
@@ -0,0 +1,18 @@
+<roundcube:object name="libkolab.folder_search_form" id="addressbooksearch" wrapper="searchbar toolbar"
+	ariatag="h2" label="foldersearchform" label-domain="kolab_addressbook" buttontitle="findaddressbooks" />
+
+<script>
+    // append search form for address books
+    if (rcmail.gui_objects.folderlist) {
+        $('#addressbooksearch').parent().parent()
+            .attr('aria-controls', rcmail.gui_objects.folderlist)
+            .insertBefore('#' + rcmail.gui_objects.folderlist);
+
+        rcmail.addEventListener('init', function() {
+            // Make checkboxes pretty
+            rcmail.treelist.addEventListener('add-item', function(prop) {
+                UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+            });
+        });
+    }
+</script>
diff --git a/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css b/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
index a2e78856..baf4a7ef 100644
--- a/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
+++ b/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
@@ -156,18 +156,18 @@
 	text-align: center;
 }
 
-.formbuttons .btn-contact-history {
+.formbuttons .contact-history {
 	display: inline-block;
 	padding: 1px;
 	color: #333;
 	text-decoration: none;
 }
 
-.formbuttons .btn-contact-history:hover {
+.formbuttons .contact-history:hover {
 	text-decoration: underline;
 }
 
-.formbuttons .btn-contact-history:before {
+.formbuttons .contact-history:before {
 	content: "";
 	display: inline-block;
 	position: relative;
diff --git a/plugins/kolab_addressbook/skins/larry/templates/bookedit.html b/plugins/kolab_addressbook/skins/larry/templates/bookedit.html
deleted file mode 100644
index 20378895..00000000
--- a/plugins/kolab_addressbook/skins/larry/templates/bookedit.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="iframe">
-
-<h1 class="boxtitle"><roundcube:label name="kolab_addressbook.bookproperties" /></h1>
-
-<div class="boxcontent">
-  <roundcube:object name="bookdetails" class="propform tabbed" />
-</div>
-
-<div class="footerleft formbuttons">
-	<roundcube:button command="book-save" type="input" class="button mainaction" label="save" />
-</div>
-
-<roundcube:include file="/includes/footer.html" />
-
-</body>
-</html>
diff --git a/plugins/kolab_addressbook/skins/larry/templates/search_addon.html b/plugins/kolab_addressbook/skins/larry/templates/search_addon.html
new file mode 100644
index 00000000..fa9dc7db
--- /dev/null
+++ b/plugins/kolab_addressbook/skins/larry/templates/search_addon.html
@@ -0,0 +1,43 @@
+<script>
+    // append search form for address books
+    if (rcmail.gui_objects.folderlist) {
+        var container = $('#' + rcmail.gui_objects.folderlist);
+        $('<div class="listsearchbox" style="display:none">' +
+            '<div class="searchbox" role="search" aria-labelledby="aria-labelfoldersearchform" aria-controls="' + rcmail.gui_objects.folderlist + '">' +
+                '<h3 id="aria-label-labelfoldersearchform" class="voice">' + rcmail.gettext('foldersearchform', 'kolab_addressbook') + '" /></h3>' +
+                '<label for="addressbooksearch" class="voice">' + rcmail.gettext('searchterms', 'kolab_addressbook') + '</label>' +
+                '<input type="text" name="q" id="addressbooksearch" placeholder="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" />' +
+                '<a class="iconbutton searchicon"></a>' +
+                '<a href="#reset" onclick="return rcmail.command(\'reset-listsearch\',null,this,event)" id="directorylistsearch-reset" class="iconbutton reset" title="' + rcmail.gettext('resetsearch') + '">' +
+                    rcmail.gettext('resetsearch') + '</a>' +
+            '</div>' +
+        '</div>')
+        .insertBefore(container.parent());
+
+        $('<a>').attr({href: "#search", "class": "iconbutton search", title: rcmail.gettext('findaddressbooks', 'kolab_addressbook'), tabindex: 0})
+            .text(rcmail.gettext('findaddressbooks', 'kolab_addressbook'))
+            .appendTo('#directorylistbox h2.boxtitle')
+            .click(function(e) {
+                var title = $('#directorylistbox .boxtitle'),
+                    box = $('#directorylistbox .listsearchbox'),
+                    dir = box.is(':visible') ? -1 : 1;
+
+                box.slideToggle({
+                    duration: 160,
+                    progress: function(animation, progress) {
+                        if (dir < 0) progress = 1 - progress;
+                        $('#directorylistbox .scroller').css('top', (title.outerHeight() + 34 * progress) + 'px');
+                    },
+                    complete: function() {
+                        box.toggleClass('expanded');
+                        if (box.is(':visible')) {
+                            box.find('input[type=text]').focus();
+                        }
+                        else {
+                            $('#directorylistsearch-reset').click();
+                        }
+                    }
+                });
+            });
+    }
+</script>
diff --git a/plugins/kolab_auth/composer.json b/plugins/kolab_auth/composer.json
index 5fec1045..94655668 100644
--- a/plugins/kolab_auth/composer.json
+++ b/plugins/kolab_auth/composer.json
@@ -4,7 +4,7 @@
     "description": "Kolab authentication",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/kolab_auth/config.inc.php.dist b/plugins/kolab_auth/config.inc.php.dist
index 8c01d566..ac362b38 100644
--- a/plugins/kolab_auth/config.inc.php.dist
+++ b/plugins/kolab_auth/config.inc.php.dist
@@ -88,4 +88,10 @@ $config['kolab_auth_role_settings'] = Array(
 // Note: special name '*' for all LDAP addressbooks
 $config['kolab_auth_ldap_addressbooks'] = array('*');
 
+// Enables storing/updating session tokens for free-busy token authentication
+// See httpauth.allow_token option in Free-Busy service config.
+// The option can be set to a number of seconds after which the token-session
+// expires or to true (to get the configured Roundcube session time)
+$config['freebusy_session_auth'] = null;
+
 ?>
diff --git a/plugins/kolab_auth/kolab_auth.php b/plugins/kolab_auth/kolab_auth.php
index 926c5065..91d1c751 100644
--- a/plugins/kolab_auth/kolab_auth.php
+++ b/plugins/kolab_auth/kolab_auth.php
@@ -42,6 +42,7 @@ class kolab_auth extends rcube_plugin
 
         $this->add_hook('authenticate', array($this, 'authenticate'));
         $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('ready', array($this, 'ready'));
         $this->add_hook('user_create', array($this, 'user_create'));
 
         // Hook for password change
@@ -64,7 +65,6 @@ class kolab_auth extends rcube_plugin
         // Enable debug logs (per-user), when logged as another user
         if (!empty($_SESSION['kolab_auth_admin']) && $rcmail->config->get('kolab_auth_auditlog')) {
             $rcmail->config->set('debug_level', 1);
-            $rcmail->config->set('devel_mode', true);
             $rcmail->config->set('smtp_log', true);
             $rcmail->config->set('log_logins', true);
             $rcmail->config->set('log_session', true);
@@ -83,6 +83,69 @@ class kolab_auth extends rcube_plugin
         }
     }
 
+    /**
+     * Ready hook handler
+     */
+    public function ready($args)
+    {
+        $rcmail = rcube::get_instance();
+
+        // Store user unique identifier for freebusy_session_auth feature
+        if (!($uniqueid = $rcmail->config->get('kolab_uniqueid'))) {
+            $uniqueid = $_SESSION['kolab_auth_uniqueid'];
+
+            if (!$uniqueid) {
+                // Find user record in LDAP
+                if (($ldap = self::ldap()) && $ldap->ready) {
+                    if ($record = $ldap->get_user_record($rcmail->get_user_name(), $_SESSION['kolab_host'])) {
+                        $uniqueid = $record['uniqueid'];
+                    }
+                }
+            }
+
+            if ($uniqueid) {
+                $uniqueid = md5($uniqueid);
+                $rcmail->user->save_prefs(array('kolab_uniqueid' => $uniqueid));
+            }
+        }
+
+        // Set/update freebusy_session_auth entry
+        if ($uniqueid && empty($_SESSION['kolab_auth_admin'])
+            && ($ttl = $rcmail->config->get('freebusy_session_auth'))
+        ) {
+            if ($ttl === true) {
+                $ttl = $rcmail->config->get('session_lifetime', 0) * 60;
+
+                if (!$ttl) {
+                    $ttl = 10 * 60;
+                }
+            }
+
+            $rcmail->config->set('freebusy_auth_cache', 'db');
+            $rcmail->config->set('freebusy_auth_cache_ttl', $ttl);
+
+            if ($cache = $rcmail->get_cache_shared('freebusy_auth', false)) {
+                $key      = md5($uniqueid . ':' . rcube_utils::remote_addr() . ':' . $rcmail->get_user_name());
+                $value    = $cache->get($key);
+                $deadline = new DateTime('now', new DateTimeZone('UTC'));
+
+                // We don't want to do the cache update on every request
+                // do it once in a 1/10 of the ttl
+                if ($value) {
+                    $value = new DateTime($value);
+                    $value->sub(new DateInterval('PT' . intval($ttl * 9/10) . 'S'));
+                    if ($value > $deadline) {
+                        return;
+                    }
+                }
+
+                $deadline->add(new DateInterval('PT' . $ttl . 'S'));
+
+                $cache->set($key, $deadline->format(DateTime::ISO8601));
+            }
+        }
+    }
+
     /**
      * Startup hook handler
      */
@@ -158,7 +221,7 @@ class kolab_auth extends rcube_plugin
      * Modifies list of plugins and settings according to
      * specified LDAP roles
      */
-    public function load_user_role_plugins_and_settings()
+    public function load_user_role_plugins_and_settings($startup = false)
     {
         if (empty($_SESSION['user_roledns'])) {
             return;
@@ -263,7 +326,16 @@ class kolab_auth extends rcube_plugin
 
             if (!empty($role_plugins[$role_dn])) {
                 foreach ((array)$role_plugins[$role_dn] as $plugin) {
-                    $this->api->load_plugin($plugin);
+                    $loaded = $this->api->load_plugin($plugin);
+
+                    // Some plugins e.g. kolab_2fa use 'startup' hook to
+                    // register other hooks, but when called on 'authenticate' hook
+                    // we're already after 'startup', so we'll call it directly
+                    if ($loaded && $startup && $plugin == 'kolab_2fa'
+                        && ($plugin = $this->api->get_plugin($plugin))
+                    ) {
+                        $plugin->startup(array('task' => $rcmail->task, 'action' => $rcmail->action));
+                    }
                 }
             }
         }
@@ -294,13 +366,15 @@ class kolab_auth extends rcube_plugin
             }
         }
         // Define the user log directory if a username is provided
-        else if ($rcmail->config->get('per_user_logging') && !empty($this->username)) {
+        else if ($rcmail->config->get('per_user_logging') && !empty($this->username)
+            && !stripos($log_dir, '/' . $this->username) // maybe already set by syncroton, skip
+        ) {
             $user_log_dir = $log_dir . '/' . strtolower($this->username);
             if (is_writable($user_log_dir)) {
                 $args['dir'] = $user_log_dir;
             }
-            else if ($args['name'] != 'errors') {
-                $args['abort'] = true;  // don't log if unauthenticed
+            else if (!in_array($args['name'], array('errors', 'userlogins', 'sendmail'))) {
+                $args['abort'] = true;  // don't log if unauthenticed or no per-user log dir
             }
         }
 
@@ -390,17 +464,10 @@ class kolab_auth extends rcube_plugin
 
         $ldap = self::ldap();
         if (!$ldap || !$ldap->ready) {
-            $args['abort'] = true;
-            $args['kolab_ldap_error'] = true;
-            $message = sprintf(
-                    'Login failure for user %s from %s in session %s (error %s)',
-                    $user,
-                    rcube_utils::remote_ip(),
-                    session_id(),
-                    "LDAP not ready"
-                );
+            self::log_login_error($user, "LDAP not ready");
 
-            rcube::write_log('userlogins', $message);
+            $args['abort']            = true;
+            $args['kolab_ldap_error'] = true;
 
             return $args;
         }
@@ -409,16 +476,9 @@ class kolab_auth extends rcube_plugin
         $record = $ldap->get_user_record($user, $host);
 
         if (empty($record)) {
-            $args['abort'] = true;
-            $message = sprintf(
-                    'Login failure for user %s from %s in session %s (error %s)',
-                    $user,
-                    rcube_utils::remote_ip(),
-                    session_id(),
-                    "No user record found"
-                );
+            self::log_login_error($user, "No user record found");
 
-            rcube::write_log('userlogins', $message);
+            $args['abort'] = true;
 
             return $args;
         }
@@ -452,16 +512,9 @@ class kolab_auth extends rcube_plugin
             $result = $ldap->bind($record['dn'], $pass);
 
             if (!$result) {
-                $args['abort'] = true;
-                $message = sprintf(
-                        'Login failure for user %s from %s in session %s (error %s)',
-                        $user,
-                        rcube_utils::remote_ip(),
-                        session_id(),
-                        "Unable to bind with '" . $record['dn'] . "'"
-                    );
+                self::log_login_error($user, "Unable to bind with '" . $record['dn'] . "'");
 
-                rcube::write_log('userlogins', $message);
+                $args['abort'] = true;
 
                 return $args;
             }
@@ -549,16 +602,7 @@ class kolab_auth extends rcube_plugin
                     'vars' => array('user' => rcube::Q($loginas)),
                 ));
 
-                $message = sprintf(
-                        'Login failure for user %s (as user %s) from %s in session %s (error %s)',
-                        $user,
-                        $loginas,
-                        rcube_utils::remote_ip(),
-                        session_id(),
-                        "No privileges to login as '" . $loginas . "'"
-                    );
-
-                rcube::write_log('userlogins', $message);
+                self::log_login_error($user, "No privileges to login as '" . $loginas . "'", $loginas);
 
                 return $args;
             }
@@ -585,6 +629,12 @@ class kolab_auth extends rcube_plugin
         // we don't like to use LDAP (connection + bind + search)
         $_SESSION['kolab_auth_vars'] = $ldap->get_parse_vars();
 
+        // Store user unique identifier for freebusy_session_auth feature
+        $_SESSION['kolab_auth_uniqueid'] = is_array($record['uniqueid']) ? $record['uniqueid'][0] : $record['uniqueid'];
+
+        // Store also host as we need it for get_user_reacod() in 'ready' hook handler
+        $_SESSION['kolab_host'] = $host;
+
         // Set user login
         if ($login_attr) {
             $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
@@ -624,7 +674,7 @@ class kolab_auth extends rcube_plugin
         }
 
         // load per-user settings/plugins
-        $this->load_user_role_plugins_and_settings();
+        $this->load_user_role_plugins_and_settings(true);
 
         return $args;
     }
@@ -762,6 +812,8 @@ class kolab_auth extends rcube_plugin
             return null;
         }
 
+        $addressbook['fieldmap']['uniqueid'] = 'nsuniqueid';
+
         require_once __DIR__ . '/kolab_auth_ldap.php';
 
         self::$ldap = new kolab_auth_ldap($addressbook);
@@ -769,6 +821,17 @@ class kolab_auth extends rcube_plugin
         return self::$ldap;
     }
 
+    /**
+     * Close LDAP connection
+     */
+    public static function ldap_close()
+    {
+        if (self::$ldap) {
+            self::$ldap->close();
+            self::$ldap = null;
+        }
+    }
+
     /**
      * Parses LDAP DN string with replacing supported variables.
      * See kolab_auth_ldap::parse_vars()
@@ -785,4 +848,44 @@ class kolab_auth extends rcube_plugin
 
         return $str;
     }
+
+    /**
+     * Log failed logins
+     *
+     * @param string $username Username/Login
+     * @param string $message  Error message (failure reason)
+     * @param string $login_as Username/Login of "login as" user
+     */
+    public static function log_login_error($username, $message = null, $login_as = null)
+    {
+        $config = rcube::get_instance()->config;
+
+        if ($config->get('log_logins')) {
+            // don't fill the log with complete input, which could
+            // have been prepared by a hacker
+            if (strlen($username) > 256) {
+                $username = substr($username, 0, 256) . '...';
+            }
+            if (strlen($login_as) > 256) {
+                $login_as = substr($login_as, 0, 256) . '...';
+            }
+
+            if ($login_as) {
+                $username = sprintf('%s (as user %s)', $username, $login_as);
+            }
+
+            $message = sprintf(
+                "Failed login for %s from %s in session %s %s",
+                $username,
+                rcube_utils::remote_ip(),
+                session_id() ?: 'no-session',
+                $message ? "($message)" : ''
+            );
+
+            rcube::write_log('userlogins', $message);
+
+            // disable log_logins to prevent from duplicate log entries
+            $config->set('log_logins', false);
+        }
+    }
 }
diff --git a/plugins/kolab_auth/localization/sv_SE.inc b/plugins/kolab_auth/localization/el.inc
similarity index 62%
rename from plugins/kolab_auth/localization/sv_SE.inc
rename to plugins/kolab_auth/localization/el.inc
index 216fa4b9..dc6061da 100644
--- a/plugins/kolab_auth/localization/sv_SE.inc
+++ b/plugins/kolab_auth/localization/el.inc
@@ -6,6 +6,5 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
-$labels['loginas'] = 'Logga in som';
-$labels['loginasnotallowed'] = 'Du har inte befogenhet att logga in som $user';
+$labels['loginas'] = 'Είσοδος ως';
 ?>
diff --git a/plugins/kolab_auth/localization/es_AR.inc b/plugins/kolab_auth/localization/es_AR.inc
index ea16f41f..8b9c01ec 100644
--- a/plugins/kolab_auth/localization/es_AR.inc
+++ b/plugins/kolab_auth/localization/es_AR.inc
@@ -7,4 +7,5 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
 $labels['loginas'] = 'Ingresar como';
+$labels['loginasnotallowed'] = 'No tiene privilegios para ingresar como $user';
 ?>
diff --git a/plugins/kolab_auth/localization/es_ES.inc b/plugins/kolab_auth/localization/es_ES.inc
index ed203e6b..589878db 100644
--- a/plugins/kolab_auth/localization/es_ES.inc
+++ b/plugins/kolab_auth/localization/es_ES.inc
@@ -6,4 +6,6 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
+$labels['loginas'] = 'Iniciar sesión como';
+$labels['loginasnotallowed'] = 'No hay privilegios para iniciar sesión como $usuario';
 ?>
diff --git a/plugins/kolab_auth/localization/et_EE.inc b/plugins/kolab_auth/localization/et_EE.inc
new file mode 100644
index 00000000..a5c1ad48
--- /dev/null
+++ b/plugins/kolab_auth/localization/et_EE.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Auth plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
+ */
+$labels['loginas'] = 'Logi sisse kui';
+$labels['loginasnotallowed'] = 'Pole õigusi, et logida sisse kui $user';
+?>
diff --git a/plugins/kolab_auth/localization/fr_FR.inc b/plugins/kolab_auth/localization/fr_FR.inc
index 6538f5b3..5718f5d3 100644
--- a/plugins/kolab_auth/localization/fr_FR.inc
+++ b/plugins/kolab_auth/localization/fr_FR.inc
@@ -7,5 +7,5 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
 $labels['loginas'] = 'Se connecter en tant que';
-$labels['loginasnotallowed'] = 'Pas de privilège de se connecter comme $utilisateur';
+$labels['loginasnotallowed'] = 'Pas d\'autorisation de se connecter en tant que $utilisateur';
 ?>
diff --git a/plugins/kolab_auth/localization/ja_JP.inc b/plugins/kolab_auth/localization/ja_JP.inc
index e3607378..cbf332f2 100644
--- a/plugins/kolab_auth/localization/ja_JP.inc
+++ b/plugins/kolab_auth/localization/ja_JP.inc
@@ -7,4 +7,5 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
 $labels['loginas'] = 'ログイン';
+$labels['loginasnotallowed'] = '$user としてログインする権限がありません';
 ?>
diff --git a/plugins/kolab_auth/localization/nl_NL.inc b/plugins/kolab_auth/localization/nl_NL.inc
index ea3a1c05..daf2555d 100644
--- a/plugins/kolab_auth/localization/nl_NL.inc
+++ b/plugins/kolab_auth/localization/nl_NL.inc
@@ -6,5 +6,6 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
-$labels['loginas'] = 'Log in als';
+$labels['loginas'] = 'Aanmelden als';
+$labels['loginasnotallowed'] = 'Geen bevoegdheden om aan te melden als $user';
 ?>
diff --git a/plugins/kolab_auth/localization/pl_PL.inc b/plugins/kolab_auth/localization/pl_PL.inc
index ed203e6b..89fb6f46 100644
--- a/plugins/kolab_auth/localization/pl_PL.inc
+++ b/plugins/kolab_auth/localization/pl_PL.inc
@@ -6,4 +6,6 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
  */
+$labels['loginas'] = 'Zaloguj jako';
+$labels['loginasnotallowed'] = 'Brak uprawnień do zalogowania jako $user';
 ?>
diff --git a/plugins/kolab_auth/localization/th_TH.inc b/plugins/kolab_auth/localization/th_TH.inc
new file mode 100644
index 00000000..59b6cfb0
--- /dev/null
+++ b/plugins/kolab_auth/localization/th_TH.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Auth plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
+ */
+$labels['loginas'] = 'เข้าระบบด้วยชื่อ..';
+$labels['loginasnotallowed'] = 'ไม่มีสิทธิเข้าระบบด้วยชื่อผู้ใช้ $user';
+?>
diff --git a/plugins/kolab_auth/localization/uk_UA.inc b/plugins/kolab_auth/localization/uk_UA.inc
new file mode 100644
index 00000000..25cdefa2
--- /dev/null
+++ b/plugins/kolab_auth/localization/uk_UA.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Auth plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
+ */
+$labels['loginas'] = 'Увійти як користувач';
+$labels['loginasnotallowed'] = 'Немає привілеїв, увійти як $user';
+?>
diff --git a/plugins/kolab_auth/localization/zh_CN.inc b/plugins/kolab_auth/localization/zh_CN.inc
new file mode 100644
index 00000000..623bc45b
--- /dev/null
+++ b/plugins/kolab_auth/localization/zh_CN.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Auth plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_auth/
+ */
+$labels['loginas'] = '以xxx登录';
+$labels['loginasnotallowed'] = '无权限以 $user 登录';
+?>
diff --git a/plugins/kolab_zpush/LICENSE b/plugins/kolab_chat/LICENSE
similarity index 100%
rename from plugins/kolab_zpush/LICENSE
rename to plugins/kolab_chat/LICENSE
diff --git a/plugins/kolab_chat/composer.json b/plugins/kolab_chat/composer.json
new file mode 100644
index 00000000..8db1e282
--- /dev/null
+++ b/plugins/kolab_chat/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "kolab/kolab_chat",
+    "type": "roundcube-plugin",
+    "description": "Chat integration plugin",
+    "homepage": "https://git.kolab.org/diffusion/RPK/",
+    "license": "AGPLv3",
+    "version": "3.4.0",
+    "authors": [
+        {
+            "name": "Aleksander Machniak",
+            "email": "machniak@kolabsys.com",
+            "role": "Lead"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3",
+        "kolab/libkolab": ">=3.4.0"
+    }
+}
diff --git a/plugins/kolab_chat/config.inc.php.dist b/plugins/kolab_chat/config.inc.php.dist
new file mode 100644
index 00000000..b5709309
--- /dev/null
+++ b/plugins/kolab_chat/config.inc.php.dist
@@ -0,0 +1,41 @@
+<?php
+
+/*
+  Mattermost integration.
+  -----------------------
+
+  0. Current implementation requires user credentials to be the same
+    as in the Kolab server. Thanks to this we can auto-login users.
+  1. It has to use the same domain, if it's using different we have to use a proxy:
+    Following Apache config worked for me with kolab_chat_url=https://kolab.example.com/mattermost
+
+    ProxyPreserveHost Off
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} (/mattermost)?/api/v[0-9]+/(users/)?websocket [NC,OR]
+    RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR]
+    RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
+    RewriteRule (/mattermost)?(/api/v[0-9]+/(users/)?websocket) ws://mattermost.example.com:8065$2 [P,QSA,L]
+    ProxyPass         /mattermost http://mattermost.example.com:8065
+
+    // replace Mattermost security headers allowing the webmail domain
+    Header set X-Frame-Options "allow-from https://webmail.example.com";
+    Header set Content-Security-Policy "frame-ancestors https://webmail.example.com";
+
+  2. Enabling CORS connections in Mattermost config: AllowCorsFrom:"webmail.example.com" (or "*")
+*/
+
+// Chat application name. For now only 'mattermost' is supported.
+$config['kolab_chat_driver'] = 'mattermost';
+
+// Chat application URL
+$config['kolab_chat_url'] = 'https://mattermost.example.com';
+
+// Optional chat application domain (for session cookies)
+$config['kolab_chat_session_domain'] = null;
+
+// Enables opening chat in a new window (or tab)
+$config['kolab_chat_extwin'] = false;
+
+// Default channel to select when opening the chat app.
+// Note: This has to be a channel ID.
+$config['kolab_chat_channel'] = null;
diff --git a/plugins/kolab_chat/drivers/mattermost.php b/plugins/kolab_chat/drivers/mattermost.php
new file mode 100644
index 00000000..342d585c
--- /dev/null
+++ b/plugins/kolab_chat/drivers/mattermost.php
@@ -0,0 +1,358 @@
+<?php
+
+/**
+ * Mattermost driver for Kolab Chat
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_chat_mattermost
+{
+    private $rc;
+    private $plugin;
+    private $token_valid = false;
+
+
+    /**
+     * Object constructor
+     *
+     * @param rcube_plugin $plugin Kolab_chat plugin object
+     */
+    public function __construct($plugin)
+    {
+        $this->rc     = rcube::get_instance();
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Returns location of the chat app
+     *
+     * @param bool $websocket Return websocket URL
+     *
+     * @return string The chat app location
+     */
+    public function url($websocket = false)
+    {
+        $url = rtrim($this->rc->config->get('kolab_chat_url'), '/');
+
+        if ($websocket) {
+            $url  = str_replace(array('http://', 'https://'), array('ws://', 'wss://'), $url);
+            $url .= '/api/v4/websocket';
+        }
+        else if ($this->rc->action == 'index' && $this->rc->task == 'kolab-chat') {
+            $channel = rcube_utils::get_input_value('_channel', rcube_utils::INPUT_GET);
+            if (empty($channel)) {
+                $channel = $this->rc->config->get('kolab_chat_channel');
+            }
+
+            if ($channel) {
+                $team = rcube_utils::get_input_value('_team', rcube_utils::INPUT_GET);
+                if (empty($team) && ($_channel = $this->get_channel($channel, true))) {
+                    $team = $_channel['team_name'];
+                }
+
+                if ($channel && $team) {
+                    $url .= '/' . urlencode($team) . '/channels/' . urlencode($channel);
+                }
+            }
+        }
+
+        return $url;
+    }
+
+    /**
+     * Add/register UI elements
+     */
+    public function ui()
+    {
+        if ($this->rc->task != 'kolab-chat') {
+            $this->plugin->include_script("js/mattermost.js");
+            $this->plugin->add_label('openchat', 'directmessage', 'mentionmessage');
+        }
+        else if ($this->get_token()) {
+            $this->setcookie('MMUSERID', $_SESSION['mattermost'][0]);
+            $this->setcookie('MMAUTHTOKEN', $_SESSION['mattermost'][1]);
+        }
+    }
+
+    /**
+     * Driver specific actions handler
+     */
+    public function action()
+    {
+        $result = array(
+            'url'     => $this->url(true),
+            'token'   => $this->get_token(),
+            'user_id' => $this->get_user_id(),
+        );
+
+        echo rcube_output::json_serialize($result);
+        exit;
+    }
+
+    /**
+     * Handler for preferences_list hook.
+     * Adds options blocks into Chat settings sections in Preferences.
+     *
+     * @param array &$p Hook parameters
+     */
+    public function preferences_list(&$p)
+    {
+        $no_override = array_flip((array) $this->rc->config->get('dont_override'));
+
+        if (!isset($no_override['kolab_chat_channel'])) {
+            $field_id = 'rcmfd_kolab_chat_channel';
+            $select   = new html_select(array('name' => '_kolab_chat_channel', 'id' => $field_id));
+
+            $select->add('---', '');
+            if ($channels = $this->get_channels_list()) {
+                foreach ($channels as $channel) {
+                    if ($channel['name'] && $channel['display_name']) {
+                        $select->add($channel['display_name'], $channel['id']);
+                    }
+                }
+            }
+
+            $p['blocks']['main']['options']['kolab_chat_channel'] = array(
+                'title'   => html::label($field_id, rcube::Q($this->plugin->gettext('defaultchannel'))),
+                'content' => $select->show($this->rc->config->get('kolab_chat_channel')),
+            );
+        }
+    }
+
+    /**
+     * Handler for preferences_save hook.
+     * Executed on Chat settings form submit.
+     *
+     * @param array &$p Hook parameters
+     */
+    public function preferences_save(&$p)
+    {
+        if (isset($_POST['_kolab_chat_channel'])) {
+            $p['prefs']['kolab_chat_channel'] = rcube_utils::get_input_value('_kolab_chat_channel', rcube_utils::INPUT_POST);
+        }
+    }
+
+    /**
+     * Returns the Mattermost session token
+     * Note: This works only if the user/pass is the same in Kolab and Mattermost
+     *
+     * @return string Session token
+     */
+    protected function get_token()
+    {
+        $user = $_SESSION['username'];
+        $pass = $this->rc->decrypt($_SESSION['password']);
+
+        // Use existing token if still valid
+        if (!empty($_SESSION['mattermost'])) {
+            $user_id = $_SESSION['mattermost'][0];
+            $token   = $_SESSION['mattermost'][1];
+
+            if ($this->token_valid) {
+                return $token;
+            }
+
+            try {
+                $request = $this->get_api_request('GET', '/users/me');
+                $request->setHeader('Authorization', "Bearer $token");
+
+                $response = $request->send();
+                $status   = $response->getStatus();
+
+                if ($status != 200) {
+                    $token = null;
+                }
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, false);
+                $token = null;
+            }
+        }
+
+        // Request a new session token
+        if (empty($token)) {
+            $request = $this->get_api_request('POST', '/users/login');
+            $request->setBody(json_encode(array(
+                    'login_id' => $user,
+                    'password' => $pass,
+            )));
+
+            // send request to the API, get token and user ID
+            try {
+                $response = $request->send();
+                $status   = $response->getStatus();
+                $token    = $response->getHeader('Token');
+                $body     = json_decode($response->getBody(), true);
+
+                if ($status == 200) {
+                    $user_id = $body['id'];
+                }
+                else if (is_array($body) && $body['message']) {
+                    throw new Exception($body['message']);
+                }
+                else {
+                    throw new Exception("Failed to authenticate the chat user ($user). Status: $status");
+                }
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, false);
+            }
+        }
+
+        if ($user_id && $token) {
+            $this->token_valid = true;
+            $_SESSION['mattermost'] = array($user_id, $token);
+            return $token;
+        }
+    }
+
+    /**
+     * Returns the Mattermost user ID
+     * Note: This works only if the user/pass is the same in Kolab and Mattermost
+     *
+     * @return string User ID
+     */
+    protected function get_user_id()
+    {
+        if ($token = $this->get_token()) {
+            return $_SESSION['mattermost'][0];
+        }
+    }
+
+    /**
+     * Returns the Mattermost channel info
+     *
+     * @param string $channel_id Channel ID
+     * @param bool   $extended   Return extended information (i.e. team information)
+     *
+     * @return array Channel information
+     */
+    protected function get_channel($channel_id, $extended = false)
+    {
+        $channel = $this->api_get('/channels/' . urlencode($channel_id));
+
+        if ($extended && is_array($channel)) {
+            if (!empty($channel['team_id'])) {
+                 $team = $this->api_get('/teams/' . urlencode($channel['team_id']));
+            }
+            else if ($teams = $this->get_user_teams()) {
+                // if there's no team assigned to the channel, we'll get the user's team
+                // so we can build proper channel URL, there's no other way in the API
+                $team = $teams[0];
+            }
+
+            if (!empty($team)) {
+                $channel['team_id']   = $team['id'];
+                $channel['team_name'] = $team['name'];
+            }
+        }
+
+        return $channel;
+    }
+
+    /**
+     * Returns the Mattermost channels list for the user
+     *
+     * @return array Channels list (id, name, display_name, etc.)
+     */
+    protected function get_channels_list()
+    {
+        // FIXME: Should we list only public channels here?
+        // FIXME: SHould we check all user teams?
+
+        $user_id = $this->get_user_id();
+        $teams   = $this->get_user_teams();
+
+        if (!empty($teams) && ($team = $teams[0])) {
+            // FIXME: Why it does return channels not assigned to the specified team?
+            return $this->api_get(sprintf('/users/%s/teams/%s/channels', urlencode($user_id), urlencode($team['id'])));
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the Mattermost teams of the user
+     *
+     * @return array List of teams
+     */
+    protected function get_user_teams()
+    {
+        return $this->api_get('/users/' . urlencode($this->get_user_id()) . '/teams');
+    }
+
+    /**
+     * Return HTTP/Request2 instance for Mattermost API connection
+     */
+    protected function get_api_request($type, $path)
+    {
+        $url      = rtrim($this->rc->config->get('kolab_chat_url'), '/');
+        $defaults = array(
+            'store_body'       => true,
+            'follow_redirects' => true,
+        );
+
+        $config = array_merge($defaults, (array) $this->rc->config->get('kolab_chat_http_request'));
+
+        return libkolab::http_request($url . '/api/v4' . $path, $type, $config);
+    }
+
+    /**
+     * Call API GET command
+     */
+    protected function api_get($path)
+    {
+        if ($token = $this->get_token()) {
+            try {
+                $request = $this->get_api_request('GET', $path);
+                $request->setHeader('Authorization', "Bearer $token");
+
+                $response = $request->send();
+                $status   = $response->getStatus();
+                $body     = $response->getBody();
+
+                if ($status == 200) {
+                    return json_decode($body, true);
+                }
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, false);
+            }
+        }
+    }
+
+    /**
+     * Set mattermost session cookies
+     */
+    protected function setcookie($name, $value)
+    {
+        if (headers_sent()) {
+            return;
+        }
+
+        $cookie = session_get_cookie_params();
+        $secure = $cookie['secure'] || self::https_check();
+
+        if ($domain = $this->rc->config->get('kolab_chat_session_domain')) {
+            $cookie['domain'] = $domain;
+        }
+
+        setcookie($name, $value, 0, $cookie['path'], $cookie['domain'], $secure, false);
+    }
+}
diff --git a/plugins/kolab_chat/js/mattermost.js b/plugins/kolab_chat/js/mattermost.js
new file mode 100644
index 00000000..7bcc2fb5
--- /dev/null
+++ b/plugins/kolab_chat/js/mattermost.js
@@ -0,0 +1,335 @@
+/**
+ * Mattermost driver
+ * Websocket code based on https://github.com/mattermost/mattermost-redux/master/client/websocket_client.js
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2015-2018, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2015-2018, Mattermost, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+var MAX_WEBSOCKET_FAILS = 7;
+var MIN_WEBSOCKET_RETRY_TIME = 3000; // 3 sec
+var MAX_WEBSOCKET_RETRY_TIME = 300000; // 5 mins
+
+function MMWebSocketClient()
+{
+    var Socket;
+
+    this.conn = null;
+    this.connectionUrl = null;
+    this.token = null;
+    this.sequence = 1;
+    this.connectFailCount = 0;
+    this.eventCallback = null;
+    this.firstConnectCallback = null;
+    this.reconnectCallback = null;
+    this.errorCallback = null;
+    this.closeCallback = null;
+    this.connectingCallback = null;
+    this.dispatch = null;
+    this.getState = null;
+    this.stop = false;
+    this.platform = '';
+
+    this.initialize = function(token, dispatch, getState, opts)
+    {
+        var forceConnection = opts.forceConnection || true,
+            webSocketConnector = opts.webSocketConnector || WebSocket,
+            connectionUrl = opts.connectionUrl,
+            platform = opts.platform,
+            self = this;
+
+        if (platform) {
+            this.platform = platform;
+        }
+
+        if (forceConnection) {
+            this.stop = false;
+        }
+
+        return new Promise(function(resolve, reject) {
+            if (self.conn) {
+                resolve();
+                return;
+            }
+
+            if (connectionUrl == null) {
+                console.log('websocket must have connection url');
+                reject('websocket must have connection url');
+                return;
+            }
+
+            if (!dispatch) {
+                console.log('websocket must have a dispatch');
+                reject('websocket must have a dispatch');
+                return;
+            }
+
+            if (self.connectFailCount === 0) {
+                console.log('websocket connecting to ' + connectionUrl);
+            }
+
+            Socket = webSocketConnector;
+            if (self.connectingCallback) {
+                self.connectingCallback(dispatch, getState);
+            }
+
+            var regex = /^(?:https?|wss?):(?:\/\/)?[^/]*/;
+            var captured = (regex).exec(connectionUrl);
+            var origin;
+
+            if (captured) {
+                origin = captured[0];
+
+                if (platform === 'android') {
+                    // this is done cause for android having the port 80 or 443 will fail the connection
+                    // the websocket will append them
+                    var split = origin.split(':');
+                    var port = split[2];
+                    if (port === '80' || port === '443') {
+                        origin = split[0] + ':' + split[1];
+                    }
+                }
+            } else {
+                // If we're unable to set the origin header, the websocket won't connect, but the URL is likely malformed anyway
+                console.warn('websocket failed to parse origin from ' + connectionUrl);
+            }
+
+            self.conn = new Socket(connectionUrl, [], {headers: {origin}});
+            self.connectionUrl = connectionUrl;
+            self.token = token;
+            self.dispatch = dispatch;
+            self.getState = getState;
+
+            self.conn.onopen = function() {
+                if (token && platform !== 'android') {
+                    // we check for the platform as a workaround until we fix on the server that further authentications
+                    // are ignored
+                    self.sendMessage('authentication_challenge', {token});
+                }
+
+                if (self.connectFailCount > 0) {
+                    console.log('websocket re-established connection');
+                    if (self.reconnectCallback) {
+                        self.reconnectCallback(self.dispatch, self.getState);
+                    }
+                } else if (self.firstConnectCallback) {
+                    self.firstConnectCallback(self.dispatch, self.getState);
+                }
+
+                self.connectFailCount = 0;
+                resolve();
+            };
+
+            self.conn.onclose = function() {
+                self.conn = null;
+                self.sequence = 1;
+
+                if (self.connectFailCount === 0) {
+                    console.log('websocket closed');
+                }
+
+                self.connectFailCount++;
+
+                if (self.closeCallback) {
+                    self.closeCallback(self.connectFailCount, self.dispatch, self.getState);
+                }
+
+                var retryTime = MIN_WEBSOCKET_RETRY_TIME;
+
+                // If we've failed a bunch of connections then start backing off
+                if (self.connectFailCount > MAX_WEBSOCKET_FAILS) {
+                    retryTime = MIN_WEBSOCKET_RETRY_TIME * self.connectFailCount;
+                    if (retryTime > MAX_WEBSOCKET_RETRY_TIME) {
+                        retryTime = MAX_WEBSOCKET_RETRY_TIME;
+                    }
+                }
+
+                setTimeout(function() {
+                        if (self.stop) {
+                            return;
+                        }
+                        self.initialize(token, dispatch, getState, Object.assign({}, opts, {forceConnection: true}));
+                    },
+                    retryTime
+                );
+            };
+
+            self.conn.onerror = function(evt) {
+                if (self.connectFailCount <= 1) {
+                    console.log('websocket error');
+                    console.log(evt);
+                }
+
+                if (self.errorCallback) {
+                    self.errorCallback(evt, self.dispatch, self.getState);
+                }
+            };
+
+            self.conn.onmessage = function(evt) {
+                var msg = JSON.parse(evt.data);
+                if (msg.seq_reply) {
+                    if (msg.error) {
+                        console.warn(msg);
+                    }
+                } else if (self.eventCallback) {
+                    self.eventCallback(msg, self.dispatch, self.getState);
+                }
+            };
+        });
+    }
+
+    this.setConnectingCallback = function(callback)
+    {
+        this.connectingCallback = callback;
+    }
+
+    this.setEventCallback = function(callback)
+    {
+        this.eventCallback = callback;
+    }
+
+    this.setFirstConnectCallback = function(callback)
+    {
+        this.firstConnectCallback = callback;
+    }
+
+    this.setReconnectCallback = function(callback)
+    {
+        this.reconnectCallback = callback;
+    }
+
+    this.setErrorCallback = function(callback)
+    {
+        this.errorCallback = callback;
+    }
+
+    this.setCloseCallback = function(callback) {
+        this.closeCallback = callback;
+    }
+
+    this.close = function(stop)
+    {
+        this.stop = stop;
+        this.connectFailCount = 0;
+        this.sequence = 1;
+
+        if (this.conn && this.conn.readyState === Socket.OPEN) {
+            this.conn.onclose = function(){};
+            this.conn.close();
+            this.conn = null;
+            console.log('websocket closed');
+        }
+    }
+
+    this.sendMessage = function(action, data)
+    {
+        var msg = {
+            action,
+            seq: this.sequence++,
+            data
+        };
+
+        if (this.conn && this.conn.readyState === Socket.OPEN) {
+            this.conn.send(JSON.stringify(msg));
+        } else if (!this.conn || this.conn.readyState === Socket.CLOSED) {
+            this.conn = null;
+            this.initialize(this.token, this.dispatch, this.getState, {forceConnection: true, platform: this.platform});
+        }
+    }
+}
+
+/**
+ * Initializes and starts websocket connection with Mattermost
+ */
+function mattermost_websocket_init(url, token)
+{
+    var api = new MMWebSocketClient();
+
+    api.setEventCallback(function(e) {
+        mattermost_event_handler(e);
+    });
+
+    api.initialize(token, {}, {}, {connectionUrl: url});
+}
+
+/**
+ * Handles websocket events
+ */
+function mattermost_event_handler(event)
+{
+    var msg, type;
+
+    // Direct message notification
+    if (event.event == 'posted' && event.data.channel_type == 'D') {
+        msg = rcmail.gettext('kolab_chat.directmessage');
+        type = 'user';
+    }
+    // Mention notification
+    else if (event.event == 'posted' && String(event.data.mentions).indexOf(rcmail.env.mattermost_user) > 0) {
+        msg = rcmail.gettext('kolab_chat.mentionmessage');
+        type = 'channel';
+    }
+
+    if (msg) {
+        var link = $('<a>').text(rcmail.gettext('kolab_chat.openchat')),
+            user = event.data.sender_name,
+            channel = event.data.channel_display_name,
+            channel_id = event.broadcast.channel_id,
+            msg_id = 'chat-' + type + '-' + (type == 'channel' ? channel_id : user),
+            href = '?_task=kolab-chat&_channel=' + urlencode(channel_id);
+
+        msg = msg.replace('$u', user).replace('$c', channel);
+
+        if (rcmail.env.kolab_chat_extwin) {
+            link.attr('target', '_blank');
+            href += '&redirect=1';
+        }
+
+        if (event.data.team_id) {
+            href += '&_team=' + urlencode(event.data.team_id);
+        }
+
+        link.attr('href', href);
+        msg = $('<p>').text(msg + ' ').append(link).html();
+
+        // FIXME: Should we display it indefinitely?
+        rcmail.display_message(msg, 'notice chat', 10 * 60 * 1000, msg_id);
+    }
+}
+
+
+window.WebSocket && window.rcmail && rcmail.addEventListener('init', function() {
+    // Use ajax to get the token for websocket connection
+    $.ajax({
+        type: 'GET',
+        url: '?_task=kolab-chat&_action=action&_get=token',
+        success: function(data) {
+            data = JSON.parse(data);
+            if (data && data.token) {
+                rcmail.set_env({mattermost_url: data.url, mattermost_token: data.token, mattermost_user: data.user_id});
+                mattermost_websocket_init(data.url, data.token);
+            }
+        }
+    });
+});
diff --git a/plugins/kolab_chat/kolab_chat.php b/plugins/kolab_chat/kolab_chat.php
new file mode 100644
index 00000000..830eaa4e
--- /dev/null
+++ b/plugins/kolab_chat/kolab_chat.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Kolab Chat
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_chat extends rcube_plugin
+{
+    public $task = '^(?!login|logout).*$';
+
+    private $rc;
+    private $driver;
+
+
+    public function init()
+    {
+        $this->rc = rcube::get_instance();
+
+        $this->add_hook('startup', array($this, 'startup'));
+    }
+
+    /**
+     * Startup hook handler, initializes/enables Chat
+     */
+    public function startup($args)
+    {
+        // the files module can be enabled/disabled by the kolab_auth plugin
+        if ($this->rc->config->get('kolab_chat_disabled') || !$this->rc->config->get('kolab_chat_enabled', true)) {
+            return;
+        }
+
+        $this->load_config();
+
+        $extwin = $this->rc->config->get('kolab_chat_extwin');
+        $driver = $this->rc->config->get('kolab_chat_driver', 'mattermost');
+
+        if (!$driver || !file_exists(__DIR__ . "/drivers/$driver.php")) {
+            return;
+        }
+
+        // Load the driver
+        require_once __DIR__ . "/drivers/$driver.php";
+
+        $class_name = "kolab_chat_$driver";
+        $this->driver = new $class_name($this);
+
+        $this->add_texts('localization/');
+
+        // Register UI end-points
+        $this->register_task('kolab-chat');
+        $this->register_action('index', array($this, 'ui'));
+        $this->register_action('action', array($this, 'action'));
+
+        if ($this->rc->output->type == 'html' && !$this->rc->output->get_env('framed')) {
+            $this->include_stylesheet($this->local_skin_path() . '/kolab_chat.css');
+            $this->rc->output->set_env('kolab_chat_extwin', (bool) $extwin);
+            $this->rc->output->add_script(
+"rcmail.addEventListener('beforeswitch-task', function(p) {
+    if (p == 'kolab-chat' && rcmail.env.kolab_chat_extwin) {
+        rcmail.open_window('?_task=kolab-chat&redirect=1', false, false, true);
+        return false;
+    }
+});",
+                'foot'
+            );
+
+            $this->add_button(array(
+                    'command'    => 'kolab-chat',
+                    'class'      => 'button-chat',
+                    'classsel'   => 'button-chat button-selected',
+                    'innerclass' => 'button-inner',
+                    'label'      => 'kolab_chat.chat',
+                    'type'       => 'link',
+                ), 'taskbar');
+
+            $this->driver->ui();
+        }
+
+        if ($this->rc->output->type == 'html' && $args['task'] == 'settings') {
+            // add hooks for Chat settings
+            $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
+            $this->add_hook('preferences_list', array($this, 'preferences_list'));
+            $this->add_hook('preferences_save', array($this, 'preferences_save')); 
+        }
+    }
+
+    /**
+     * Display chat iframe wrapped by Roundcube interface elements (taskmenu)
+     * or a dummy page with redirect to the chat app.
+     */
+    function ui()
+    {
+        $this->driver->ui();
+
+        $url = rcube::JQ($this->driver->url());
+
+        if (!empty($_GET['redirect'])) {
+            echo '<!DOCTYPE html><html><head>'
+                . '<meta http-equiv="refresh" content="0; url=' . $url . '">'
+                . '</head><body></body></html>';
+            exit;
+        }
+        else {
+            $this->rc->output->add_script(
+                "rcmail.addEventListener('init', function() {"
+                    . "rcmail.location_href('$url', rcmail.get_frame_window(rcmail.env.contentframe));"
+                . "});",
+                'foot'
+            );
+
+            $this->rc->output->send('kolab_chat.chat');
+        }
+    }
+
+    /**
+     * Handler for driver specific actions
+     */
+    function action()
+    {
+        $this->driver->action();
+    }
+
+    /**
+     * Handler for preferences_sections_list hook.
+     * Adds Chat settings section into preferences sections list.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_sections_list($p)
+    {
+        $p['list']['kolab-chat'] = array(
+            'id' => 'kolab-chat', 'section' => $this->gettext('chat'), 'class' => 'chat'
+        );
+
+        return $p;
+    }
+
+    /**
+     * Handler for preferences_list hook.
+     * Adds options blocks into Chat settings sections in Preferences.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_list($p)
+    {
+        if ($p['section'] != 'kolab-chat') {
+            return $p;
+        }
+
+        $no_override = array_flip((array) $this->rc->config->get('dont_override'));
+
+        $p['blocks']['main']['name'] = $this->gettext('mainoptions');
+
+        if (!isset($no_override['kolab_chat_extwin'])) {
+            if (!$p['current']) {
+                $p['blocks']['main']['content'] = true;
+                return $p;
+            }
+
+            $field_id = 'rcmfd_kolab_chat_extwin';
+            $input    = new html_checkbox(array('name' => '_kolab_chat_extwin', 'id' => $field_id, 'value' => 1));
+
+            $p['blocks']['main']['options']['kolab_chat_extwin'] = array(
+                'title'   => html::label($field_id, rcube::Q($this->gettext('showinextwin'))),
+                'content' => $input->show($this->rc->config->get('kolab_chat_extwin') ? 1 : 0),
+            );
+        }
+
+        if ($p['current']) {
+            // update env flag in the parent window
+            $this->rc->output->command('parent.set_env', array('kolab_chat_extwin' => (bool) $this->rc->config->get('kolab_chat_extwin')));
+
+            // Add driver-specific options
+            $this->driver->preferences_list($p);
+        }
+
+        return $p;
+    }
+
+    /**
+     * Handler for preferences_save hook.
+     * Executed on Chat settings form submit.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_save($p)
+    {
+        if ($p['section'] == 'kolab-chat') {
+            $p['prefs'] = array(
+                'kolab_chat_extwin' => isset($_POST['_kolab_chat_extwin']),
+            );
+
+            // Add driver-specific options
+            $this->driver->preferences_save($p);
+        }
+
+        return $p;
+    }
+}
diff --git a/plugins/kolab_chat/localization/de_DE.inc b/plugins/kolab_chat/localization/de_DE.inc
new file mode 100644
index 00000000..67af663f
--- /dev/null
+++ b/plugins/kolab_chat/localization/de_DE.inc
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Localizations for the Kolab Chat plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_chat/
+ */
+$labels['chat'] = 'Chat';
+$labels['showinextwin'] = 'Chatanwendung in einem neuen Fenster öffnen';
+$labels['directmessage'] = 'Eine direkte Nachricht von $u.';
+$labels['mentionmessage'] = 'Sie wurden von $u in $c erwähnt.';
+$labels['openchat'] = 'Chat öffnen';
diff --git a/plugins/kolab_chat/localization/en_US.inc b/plugins/kolab_chat/localization/en_US.inc
new file mode 100644
index 00000000..7543f6e0
--- /dev/null
+++ b/plugins/kolab_chat/localization/en_US.inc
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Localizations for the Kolab Chat plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_chat/
+ */
+
+$labels['chat'] = 'Chat';
+$labels['showinextwin'] = 'Open chat application in a new window';
+$labels['defaultchannel'] = 'Open chat application on channel';
+$labels['directmessage'] = 'A direct message from $u.';
+$labels['mentionmessage'] = 'You have been mentioned by $u in $c.';
+$labels['openchat'] = 'Open chat';
diff --git a/plugins/kolab_chat/localization/es_AR.inc b/plugins/kolab_chat/localization/es_AR.inc
new file mode 100644
index 00000000..f7a311ae
--- /dev/null
+++ b/plugins/kolab_chat/localization/es_AR.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Chat plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_chat/
+ */
+$labels['chat'] = 'Mensajería instantánea';
+$labels['showinextwin'] = 'Abrir la aplicación de mensajería instantánea en una nueva ventana';
+$labels['directmessage'] = 'Hay un mensaje directo de $u';
+$labels['openchat'] = 'Abrir conversación';
diff --git a/plugins/kolab_chat/localization/et_EE.inc b/plugins/kolab_chat/localization/et_EE.inc
new file mode 100644
index 00000000..cbeb3033
--- /dev/null
+++ b/plugins/kolab_chat/localization/et_EE.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Chat plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_chat/
+ */
+$labels['chat'] = 'Vestlus';
+$labels['showinextwin'] = 'Ava vestluse rakendus uues aknas';
+$labels['directmessage'] = 'Sõnum kasutajalt $u.';
+$labels['openchat'] = 'Ava vestlus';
diff --git a/plugins/kolab_chat/localization/fi_FI.inc b/plugins/kolab_chat/localization/fi_FI.inc
new file mode 100644
index 00000000..d032e09e
--- /dev/null
+++ b/plugins/kolab_chat/localization/fi_FI.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Chat plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_chat/
+ */
+$labels['chat'] = 'Keskustelu';
+$labels['showinextwin'] = 'Avaa keskustelusovellus uuteen ikkunaan.';
+$labels['directmessage'] = 'Suoraviesti käyttäjältä $u.';
+$labels['openchat'] = 'Avaa keskustelu';
diff --git a/plugins/kolab_chat/localization/pl_PL.inc b/plugins/kolab_chat/localization/pl_PL.inc
new file mode 100644
index 00000000..838f6585
--- /dev/null
+++ b/plugins/kolab_chat/localization/pl_PL.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Chat plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_chat/
+ */
+$labels['chat'] = 'Czat';
+$labels['showinextwin'] = 'Otwórz aplikację czatu w nowym oknie';
+$labels['directmessage'] = 'Bezpośrednia wiadomość od $u.';
+$labels['openchat'] = 'Otwórz czat';
diff --git a/plugins/kolab_chat/skins/elastic/templates/chat.html b/plugins/kolab_chat/skins/elastic/templates/chat.html
new file mode 100644
index 00000000..7ba09688
--- /dev/null
+++ b/plugins/kolab_chat/skins/elastic/templates/chat.html
@@ -0,0 +1,16 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_chat.chat" /></h1>
+
+<div class="content selected no-navbar" role="main">
+	<div class="header" data-hidden="lbs">
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<span class="header-title"><roundcube:label name="kolab_chat.chat" /></span>
+	</div>
+	<div class="iframe-wrapper">
+		<roundcube:object name="contentframe" id="kolab-chat-frame" src="env:blankpage" />
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_chat/skins/larry/images/buttons.png b/plugins/kolab_chat/skins/larry/images/buttons.png
new file mode 100644
index 00000000..4a57bdfe
Binary files /dev/null and b/plugins/kolab_chat/skins/larry/images/buttons.png differ
diff --git a/plugins/kolab_chat/skins/larry/kolab_chat.css b/plugins/kolab_chat/skins/larry/kolab_chat.css
new file mode 100644
index 00000000..2d40a9fc
--- /dev/null
+++ b/plugins/kolab_chat/skins/larry/kolab_chat.css
@@ -0,0 +1,16 @@
+#taskbar a.button-chat span.button-inner {
+    background: url(images/buttons.png) 0 -4px no-repeat;
+}
+
+#taskbar a.button-chat:hover span.button-inner,
+#taskbar a.button-chat.button-selected span.button-inner {
+    background-position: 0 -36px;
+}
+
+#sections-table #rcmrowkolab-chat .section {
+    background: url(images/buttons.png) 0 -98px no-repeat;
+}
+
+#sections-table #rcmrowkolab-chat.selected .section {
+    background-position: -1px -69px;
+}
diff --git a/plugins/kolab_chat/skins/larry/templates/chat.html b/plugins/kolab_chat/skins/larry/templates/chat.html
new file mode 100644
index 00000000..085ded87
--- /dev/null
+++ b/plugins/kolab_chat/skins/larry/templates/chat.html
@@ -0,0 +1,18 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+  <title><roundcube:object name="pagetitle" /></title>
+  <roundcube:include file="/includes/links.html" />
+</head>
+<body class="kolab-chat noscroll">
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen" class="uibox" style="overflow: hidden">
+  <roundcube:object name="contentframe" id="kolab-chat-frame" style="width:100%; height:100%" frameborder="0" src="env:blankpage" />
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+</body>
+</html>
diff --git a/plugins/kolab_config/composer.json b/plugins/kolab_config/composer.json
index 4dd72f93..a766117b 100644
--- a/plugins/kolab_config/composer.json
+++ b/plugins/kolab_config/composer.json
@@ -4,7 +4,7 @@
     "description": "Kolab configuration storage",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.7",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -21,6 +21,6 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_config/kolab_config.php b/plugins/kolab_config/kolab_config.php
index ef9d09a4..48949a30 100644
--- a/plugins/kolab_config/kolab_config.php
+++ b/plugins/kolab_config/kolab_config.php
@@ -28,7 +28,7 @@
 
 class kolab_config extends rcube_plugin
 {
-    public $task = 'utils';
+    public $task = 'utils|mail';
 
     private $config;
     private $dicts = array();
diff --git a/plugins/kolab_delegation/composer.json b/plugins/kolab_delegation/composer.json
index edde9fb4..f69a9a74 100644
--- a/plugins/kolab_delegation/composer.json
+++ b/plugins/kolab_delegation/composer.json
@@ -4,7 +4,7 @@
     "description": "Kolab delegation feature",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -21,7 +21,7 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8",
-        "kolab/kolab_auth": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0",
+        "kolab/kolab_auth": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_delegation/config.inc.php.dist b/plugins/kolab_delegation/config.inc.php.dist
index 879fd476..4eb255de 100644
--- a/plugins/kolab_delegation/config.inc.php.dist
+++ b/plugins/kolab_delegation/config.inc.php.dist
@@ -1,5 +1,21 @@
 <?php
 
+// The id of the LDAP address book (which refers to the $rcmail_config['ldap_public'])
+// or complete addressbook definition array.
+// --------------------------------------------------------------------
+// Note: Multi-domain (hosted) installations can resolve domain aliases
+//   by adding following settings in kolab_auth_addressbook spec.:
+//
+//   'domain_base_dn'   => 'cn=kolab,cn=config',
+//   'domain_filter'    => '(&(objectclass=domainrelatedobject)(associateddomain=%s))',
+//   'domain_name_attr' => 'associateddomain',
+//
+//   With this %dc variable in base_dn and groups/base_dn will be
+//   replaced with DN string of resolved domain
+//---------------------------------------------------------------------
+// When empty, defaults to kolab_auth_addressbook.
+$config['kolab_delegation_addressbook'] = '';
+
 // This will overwrite defined LDAP filter
 // Note: LDAP addressbook defined for kolab_auth plugin is used
 $config['kolab_delegation_filter'] = '(|(objectClass=kolabInetOrgPerson)(&(objectclass=kolabsharedfolder)(kolabFolderType=mail)))';
@@ -9,6 +25,19 @@ $config['kolab_delegation_filter'] = '(|(objectClass=kolabInetOrgPerson)(&(objec
 // Note: LDAP addressbook defined for kolab_auth plugin is used
 $config['kolab_delegation_delegate_field'] = 'kolabDelegate';
 
+// User authentication ID field (from fieldmap configuration)
+// See kolab_auth plugin config
+$config['kolab_delegation_login_field'] = 'email';
+
+// Use this fields (from fieldmap configuration) for identities
+// If the value array contains more than one field, first non-empty will be used
+// Note: These are not LDAP attributes, but field names in config
+// Note: If there are more than one email address, as many identities will be created
+// See kolab_auth plugin config
+$config['kolab_delegation_name_field']         = array('name', 'cn');
+$config['kolab_delegation_email_field']        = array('email');
+$config['kolab_delegation_organization_field'] = array('organization');
+
 // Remove all user identities which do not match the user's primary or alias
 // addresses and delegator's addresses
 $config['kolab_delegation_purge_identities'] = false;
diff --git a/plugins/kolab_delegation/helpdocs/en_US/settings.rst b/plugins/kolab_delegation/helpdocs/en_US/settings.rst
new file mode 100644
index 00000000..b3235d08
--- /dev/null
+++ b/plugins/kolab_delegation/helpdocs/en_US/settings.rst
@@ -0,0 +1,27 @@
+.. _settings-delegation:
+
+**********
+Delegation
+**********
+
+This is the place where you can give another person (in your organization) a responsibility
+for your mailboxes, calendars or task lists. Delegated person will have access to selected folders
+(write or read-only) and will have possibility to act in your behalf, e.g. reply to email,
+create events/tasks, handle invitations.
+
+To add a new user delegation use "Add delegate" button, type user name in the form on the right
+(wait for auto-completion and select the user from the list) and select folders to share.
+
+You can modify access rights at any time, remember to use *Save* button.
+
+When removing delegation you'll be asked if you want to remove also access rights to folders
+that previously were given access to. So, you can remove delegation but keep folder permissions
+for this person.
+
+.. note::
+  You can always change folder permissions in *Settings > Folders*.
+
+.. important::
+  The delegation feature to fully work requires from the delegated user to re-login.
+  In this process new identities will be created on delegated user account. They will
+  be removed when the delegator removes the delegation (depending on server configuration).
diff --git a/plugins/kolab_delegation/kolab_delegation.js b/plugins/kolab_delegation/kolab_delegation.js
index 01d6d30b..062a2579 100644
--- a/plugins/kolab_delegation/kolab_delegation.js
+++ b/plugins/kolab_delegation/kolab_delegation.js
@@ -7,7 +7,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2011-2015, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2016, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -27,17 +27,32 @@
  */
 
 window.rcmail && rcmail.addEventListener('init', function(evt) {
-  if (rcmail.env.task == 'mail' || rcmail.env.task == 'calendar') {
-    // set delegator context for calendar requests on invitation message
-    rcmail.addEventListener('requestcalendar/event', function(o) { rcmail.event_delegator_request(o); });
-    rcmail.addEventListener('requestcalendar/mailimportevent', function(o) { rcmail.event_delegator_request(o); });
+  if (rcmail.env.task == 'mail' || rcmail.env.task == 'calendar' || rcmail.env.task == 'tasks') {
+    // set delegator context for calendar/tasklist requests on invitation message
+    rcmail.addEventListener('requestcalendar/event', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requestcalendar/mailimportitip', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requestcalendar/itip-status', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requestcalendar/itip-remove', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requesttasks/task', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requesttasks/mailimportitip', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requesttasks/itip-status', function(o) { rcmail.event_delegator_request(o); })
+      .addEventListener('requesttasks/itip-remove', function(o) { rcmail.event_delegator_request(o); });
 
+    // Calendar UI
     if (rcmail.env.delegators && window.rcube_calendar_ui) {
-      rcmail.calendar_identity_init();
+      rcmail.calendar_identity_init('calendar');
       // delegator context for calendar event form
-      rcmail.addEventListener('calendar-event-init', function(o) { return rcmail.calendar_event_init(o); });
+      rcmail.addEventListener('calendar-event-init', function(o) { return rcmail.calendar_event_init(o, 'calendar'); });
       // change organizer identity on calendar folder change
-      $('#edit-calendar').change(function() { rcmail.calendar_change(); });
+      $('#edit-calendar').change(function() { rcmail.calendar_folder_change(this); });
+    }
+    // Tasks UI
+    else if (rcmail.env.delegators && window.rcube_tasklist_ui) {
+      rcmail.calendar_identity_init('tasklist');
+      // delegator context for task form
+      rcmail.addEventListener('tasklist-task-init', function(o) { return rcmail.calendar_event_init(o, 'tasklist'); });
+      // change organizer identity on tasks folder change
+      $('#taskedit-tasklist').change(function() { rcmail.calendar_folder_change(this); });
     }
   }
   else if (rcmail.env.task != 'settings')
@@ -78,7 +93,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
       });
 
       var fn = function(elem) {
-        var classname = elem.className,
+        var classname = elem.className.split(' ')[0],
           list = $(elem).closest('table').find('input.' + classname),
           check = list.not(':checked').length > 0;
 
@@ -149,29 +164,24 @@ rcube_webmail.prototype.delegate_delete = function()
   if (!this.env.active_delegate)
     return;
 
-  var $dialog = $("#delegate-delete-dialog").addClass('uidialog'),
-    buttons = {};
-
-  buttons[this.gettext('no', 'kolab_delegation')] = function() {
-    $dialog.dialog('close');
-  };
-  buttons[this.gettext('yes', 'kolab_delegation')] = function() {
-    $dialog.dialog('close');
-    var lock = rcmail.set_busy(true, 'kolab_delegation.savingdata');
-    rcmail.http_post('plugin.delegation-delete', {id: rcmail.env.active_delegate,
-      acl: $("#delegate-delete-dialog input:checked").length}, lock);
-  }
+  var content = $("#delegate-delete-dialog").addClass('uidialog').clone(),
+    title = this.gettext('deleteconfirm', 'kolab_delegation'),
+    save_func = function() {
+      var lock = rcmail.set_busy(true, 'kolab_delegation.savingdata'),
+        props = {id: rcmail.env.active_delegate, acl: $("#delegate-delete-dialog input:checked").length};
+      rcmail.http_post('plugin.delegation-delete', props, lock);
+      return true;
+    },
+    opts = {
+      resizable: false,
+      closeOnEscape: true,
+      width: 400,
+      button: 'kolab_delegation.yes',
+      cancel_button: 'kolab_delegation.no'
+    };
 
   // open jquery UI dialog
-  $dialog.dialog({
-    modal: true,
-    resizable: false,
-    closeOnEscape: true,
-    title: this.gettext('deleteconfirm', 'kolab_delegation'),
-    close: function() { $dialog.dialog('destroy').hide(); },
-    buttons: buttons,
-    width: 400
-  }).show();
+  this.simple_dialog(content, title, save_func, opts);
 };
 
   // submit delegate form to the server
@@ -188,8 +198,8 @@ rcube_webmail.prototype.delegate_save = function()
   }
 
   data.folders = {};
-  $('input.read:checked').each(function(i, elem) {
-    data.folders[elem.value] = 1;
+  $('input.read').each(function(i, elem) {
+    data.folders[elem.value] = this.checked ? 1 : 0;
   });
   $('input.write:checked').each(function(i, elem) {
     data.folders[elem.value] = 2;
@@ -248,27 +258,31 @@ rcube_webmail.prototype.event_delegator_request = function(data)
   return data;
 };
 
-// callback for calendar event form initialization
-rcube_webmail.prototype.calendar_event_init = function(data)
+// callback for calendar event/task form initialization
+rcube_webmail.prototype.calendar_event_init = function(data, type)
 {
+  var folder = data.o[type == 'calendar' ? 'calendar' : 'list']
+
   // set identity for delegator context
-  this.env.calendar_settings.identity = this.calendar_folder_delegator(data.o.calendar);
+  this.env[type + '_settings'].identity = this.calendar_folder_delegator(folder, type);
 };
 
-// returns delegator's identity data according to selected calendar folder
-rcube_webmail.prototype.calendar_folder_delegator = function(calendar)
+// returns delegator's identity data according to selected calendar/tasks folder
+rcube_webmail.prototype.calendar_folder_delegator = function(folder, type)
 {
-  var d, delegator;
+  var d, delegator,
+    settings = this.env[type + '_settings'],
+    list = this.env[type == 'calendar' ? 'calendars' : 'tasklists'];
 
   // derive delegator from the calendar owner property
-  if (this.env.calendars[calendar] && this.env.calendars[calendar].owner) {
-    delegator = this.env.calendars[calendar].owner.replace(/@.+$/, '');
+  if (list[folder] && list[folder].owner) {
+    delegator = list[folder].owner.replace(/@.+$/, '');
   }
 
   if (delegator && (d = this.env.delegators[delegator])) {
     // find delegator's identity id
     if (!d.identity_id)
-      $.each(this.env.calendar_settings.identities, function(i, v) {
+      $.each(settings.identities, function(i, v) {
         if (d.email == v) {
           d.identity_id = i;
           return false;
@@ -285,26 +299,28 @@ rcube_webmail.prototype.calendar_folder_delegator = function(calendar)
   return d;
 };
 
-// handler for calendar folder change
-rcube_webmail.prototype.calendar_change = function()
+// handler for calendar/tasklist folder change
+rcube_webmail.prototype.calendar_folder_change = function(element)
 {
-  var calendar = $('#edit-calendar').val(),
+  var folder = $(element).val(),
+    type = element.id.indexOf('task') > -1 ? 'tasklist' : 'calendar',
+    sname = type + '_settings',
     select = $('#edit-identities-list'),
-    old = this.env.calendar_settings.identity;
+    old = this.env[sname].identity;
 
-  this.env.calendar_settings.identity = this.calendar_folder_delegator(calendar);
+  this.env[sname].identity = this.calendar_folder_delegator(folder, type);
 
   // change organizer identity in identity selector
-  if (select.length && old != this.env.calendar_settings.identity) {
-    var id = this.env.calendar_settings.identity.identity_id;
+  if (select.length && old != this.env[sname].identity) {
+    var id = this.env[sname].identity.identity_id;
     select.val(id || select.find('option').first().val()).change();
   }
 };
 
 // modify default identity of the user
-rcube_webmail.prototype.calendar_identity_init = function()
+rcube_webmail.prototype.calendar_identity_init = function(type)
 {
-  var identity = this.env.calendar_settings.identity,
+  var identity = this.env[type + '_settings'].identity,
     emails = identity.emails.split(';');
 
   // remove delegators' emails from list of emails of the current user
@@ -317,4 +333,4 @@ rcube_webmail.prototype.calendar_identity_init = function()
 
   identity.emails = emails.join(';');
   this.env.original_identity = identity;
-}
+};
diff --git a/plugins/kolab_delegation/kolab_delegation.php b/plugins/kolab_delegation/kolab_delegation.php
index 41c6af70..a58f1b92 100644
--- a/plugins/kolab_delegation/kolab_delegation.php
+++ b/plugins/kolab_delegation/kolab_delegation.php
@@ -25,7 +25,7 @@
 
 class kolab_delegation extends rcube_plugin
 {
-    public $task = 'login|mail|settings|calendar';
+    public $task = 'login|mail|settings|calendar|tasks';
 
     private $rc;
     private $engine;
@@ -49,15 +49,19 @@ class kolab_delegation extends rcube_plugin
         // on-message-send delegation support
         $this->add_hook('message_before_send', array($this, 'message_before_send'));
 
-        // delegation support in Calendar plugin
+        // delegation support in Calendar and Tasklist plugins
         $this->add_hook('message_load', array($this, 'message_load'));
         $this->add_hook('calendar_user_emails', array($this, 'calendar_user_emails'));
         $this->add_hook('calendar_list_filter', array($this, 'calendar_list_filter'));
         $this->add_hook('calendar_load_itip', array($this, 'calendar_load_itip'));
+        $this->add_hook('tasklist_list_filter', array($this, 'tasklist_list_filter'));
 
         // delegation support in kolab_auth plugin
         $this->add_hook('kolab_auth_emails', array($this, 'kolab_auth_emails'));
 
+        // delegation support in Enigma plugin
+        $this->add_hook('enigma_user_identities', array($this, 'user_identities'));
+
         if ($this->rc->task == 'settings') {
             // delegation management interface
             $this->register_action('plugin.delegation',              array($this, 'controller_ui'));
@@ -80,8 +84,10 @@ class kolab_delegation extends rcube_plugin
                 $this->include_stylesheet($this->skin_path . '/style.css');
             }
         }
-        // Calendar plugin UI bindings
-        else if ($this->rc->task == 'calendar' && empty($_REQUEST['_framed'])) {
+        // Calendar/Tasklist plugin UI bindings
+        else if (($this->rc->task == 'calendar' || $this->rc->task == 'tasks')
+            && empty($_REQUEST['_framed'])
+        ) {
             if ($this->rc->output->type == 'html') {
                 $this->calendar_ui();
             }
@@ -200,7 +206,7 @@ class kolab_delegation extends rcube_plugin
             return $args;
         }
 
-        $engine = $this->engine();
+        $engine  = $this->engine();
         $context = $engine->delegator_context_from_message($args['object']);
 
         if ($context) {
@@ -237,7 +243,23 @@ class kolab_delegation extends rcube_plugin
 
         if (!empty($_SESSION['delegators'])) {
             $engine = $this->engine();
-            $engine->delegator_folder_filter($args);
+            $engine->delegator_folder_filter($args, 'calendars');
+        }
+
+        return $args;
+    }
+
+    /**
+     * tasklist_driver::get_lists() handler
+     */
+    public function tasklist_list_filter($args)
+    {
+        // In delegator context we'll use delegator's folders
+        // instead of current user folders
+
+        if (!empty($_SESSION['delegators'])) {
+            $engine = $this->engine();
+            $engine->delegator_folder_filter($args, 'tasklists');
         }
 
         return $args;
@@ -260,7 +282,7 @@ class kolab_delegation extends rcube_plugin
     }
 
     /**
-     * Delegation support in Calendar plugin UI
+     * Delegation support in Calendar/Tasks plugin UI
      */
     public function calendar_ui()
     {
@@ -295,6 +317,28 @@ class kolab_delegation extends rcube_plugin
         return $args;
     }
 
+    /**
+     * Delegation support in Enigma plugin
+     */
+    public function user_identities($args)
+    {
+        // Remove delegators' identities from the key generation form
+
+        if (!empty($_SESSION['delegators'])) {
+            $args['identities'] = array_filter($args['identities'], function($ident) {
+                foreach ($_SESSION['delegators'] as $emails) {
+                    if (in_array($ident['email'], $emails)) {
+                        return false;
+                    }
+                }
+
+                return true;
+            });
+        }
+
+        return $args;
+    }
+
     /**
      * Delegation UI handler
      */
@@ -331,15 +375,15 @@ class kolab_delegation extends rcube_plugin
 
         // Delegate delete
         if ($this->rc->action == 'plugin.delegation-delete') {
-            $id      = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
-            $success = $engine->delegate_delete($id, (bool) rcube_utils::get_input_value('acl', rcube_utils::INPUT_GPC));
+            $id    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
+            $error = $engine->delegate_delete($id, (bool) rcube_utils::get_input_value('acl', rcube_utils::INPUT_GPC));
 
-            if ($success) {
+            if (!$error) {
                 $this->rc->output->show_message($this->gettext('deletesuccess'), 'confirmation');
                 $this->rc->output->command('plugin.delegate_save_complete', array('deleted' => $id));
             }
             else {
-                $this->rc->output->show_message($this->gettext('deleteerror'), 'error');
+                $this->rc->output->show_message($this->gettext($error), 'error');
             }
         }
         // Delegate add/update
@@ -350,23 +394,23 @@ class kolab_delegation extends rcube_plugin
             // update
             if ($id) {
                 $delegate = $engine->delegate_get($id);
-                $success  = $engine->delegate_acl_update($delegate['uid'], $acl);
+                $error    = $engine->delegate_acl_update($delegate['uid'], $acl);
 
-                if ($success) {
+                if (!$error) {
                     $this->rc->output->show_message($this->gettext('updatesuccess'), 'confirmation');
                     $this->rc->output->command('plugin.delegate_save_complete', array('updated' => $id));
                 }
                 else {
-                    $this->rc->output->show_message($this->gettext('updateerror'), 'error');
+                    $this->rc->output->show_message($this->gettext($error), 'error');
                 }
             }
             // new
             else {
                 $login    = rcube_utils::get_input_value('newid', rcube_utils::INPUT_GPC);
                 $delegate = $engine->delegate_get_by_name($login);
-                $success  = $engine->delegate_add($delegate, $acl);
+                $error    = $engine->delegate_add($delegate, $acl);
 
-                if ($success) {
+                if (!$error) {
                     $this->rc->output->show_message($this->gettext('createsuccess'), 'confirmation');
                     $this->rc->output->command('plugin.delegate_save_complete', array(
                         'created' => $delegate['ID'],
@@ -374,7 +418,7 @@ class kolab_delegation extends rcube_plugin
                     ));
                 }
                 else {
-                    $this->rc->output->show_message($this->gettext('createerror'), 'error');
+                    $this->rc->output->show_message($this->gettext($error), 'error');
                 }
             }
         }
@@ -468,6 +512,7 @@ class kolab_delegation extends rcube_plugin
         }
 
         $folder_data   = $engine->list_folders($delegate['uid']);
+        $use_fieldsets = rcube_utils::get_boolean($attrib['use-fieldsets']);
         $rights        = array();
         $folder_groups = array();
 
@@ -481,10 +526,17 @@ class kolab_delegation extends rcube_plugin
             if (empty($group)) {
                 continue;
             }
+
             $attrib['type'] = $type;
-            $html .= html::div('foldersblock',
-                html::tag('h3', $type, $this->gettext($type)) .
-                    $this->delegate_folders_block($group, $attrib, $rights));
+            $table = $this->delegate_folders_block($group, $attrib, $rights);
+            $label = $this->gettext($type);
+
+            if ($use_fieldsets) {
+                $html .= html::tag('fieldset', 'foldersblock', html::tag('legend', $type, $label) . $table);
+            }
+            else {
+                $html .= html::div('foldersblock', html::tag('h3', $type, $label) . $table);
+            }
         }
 
         $this->rc->output->add_gui_object('folderslist', $attrib['id']);
@@ -501,9 +553,9 @@ class kolab_delegation extends rcube_plugin
         $read_ico  = $attrib['readicon'] ? html::img(array('src' =>  $path . $attrib['readicon'], 'title' => $this->gettext('read'))) : '';
         $write_ico = $attrib['writeicon'] ? html::img(array('src' => $path . $attrib['writeicon'], 'title' => $this->gettext('write'))) : '';
 
-        $table = new html_table(array('cellspacing' => 0));
-        $table->add_header(array('class' => 'read', 'title' => $this->gettext('read'), 'tabindex' => 0), $read_ico);
-        $table->add_header(array('class' => 'write', 'title' => $this->gettext('write'), 'tabindex' => 0), $write_ico);
+        $table = new html_table(array('cellspacing' => 0, 'class' => 'table-striped'));
+        $table->add_header(array('class' => 'read checkbox-cell', 'title' => $this->gettext('read'), 'tabindex' => 0), $read_ico);
+        $table->add_header(array('class' => 'write checkbox-cell', 'title' => $this->gettext('write'), 'tabindex' => 0), $write_ico);
         $table->add_header('foldername', $this->rc->gettext('folder'));
 
         $checkbox_read  = new html_checkbox(array('name' => 'read[]', 'class' => 'read'));
@@ -511,7 +563,7 @@ class kolab_delegation extends rcube_plugin
 
         $names = array();
         foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_name($folder));
+            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_prettyname($folder));
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
             for ($i = count($names)-1; $i >= 0; $i--) {
@@ -534,10 +586,10 @@ class kolab_delegation extends rcube_plugin
             }
 
             $table->add_row();
-            $table->add('read', $checkbox_read->show(
+            $table->add('read checkbox-cell', $checkbox_read->show(
                 $rights[$folder] >= kolab_delegation_engine::ACL_READ ? $folder : null,
                 array('value' => $folder)));
-            $table->add('write', $checkbox_write->show(
+            $table->add('write checkbox-cell', $checkbox_write->show(
                 $rights[$folder] >= kolab_delegation_engine::ACL_WRITE ? $folder : null,
                 array('value' => $folder, 'id' => $folder_id)));
 
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index 88e4563b..d548f242 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -28,6 +28,7 @@ class kolab_delegation_engine
     public $context;
 
     private $rc;
+    private $ldap;
     private $ldap_filter;
     private $ldap_delegate_field;
     private $ldap_login_field;
@@ -54,6 +55,8 @@ class kolab_delegation_engine
      *
      * @param string|array $delegate Delegate DN (encoded) or delegate data (result of delegate_get())
      * @param array        $acl      List of folder->right map
+     *
+     * @return string On error returns an error label, on success returns null
      */
     public function delegate_add($delegate, $acl)
     {
@@ -63,18 +66,20 @@ class kolab_delegation_engine
 
         $dn = $delegate['ID'];
         if (empty($delegate) || empty($dn)) {
-            return false;
+            return 'createerror';
         }
 
         $list = $this->list_delegates();
-
-        // add delegate to the list
         $list = array_keys((array)$list);
         $list = array_filter($list);
-        if (!in_array($dn, $list)) {
-            $list[] = $dn;
+
+        if (in_array($dn, $list)) {
+            return 'delegationexisterror';
         }
-        $list = array_map(array('kolab_auth_ldap', 'dn_decode'), $list);
+
+        // add delegate to the list
+        $list[] = $dn;
+        $list   = array_map(array('kolab_auth_ldap', 'dn_decode'), $list);
 
         // update user record
         $result = $this->user_update_delegates($list);
@@ -84,7 +89,7 @@ class kolab_delegation_engine
             $this->delegate_acl_update($delegate['uid'], $acl);
         }
 
-        return $result;
+        return $result ? null : 'createerror';
     }
 
     /**
@@ -93,6 +98,8 @@ class kolab_delegation_engine
      * @param string $uid    Delegate authentication identifier
      * @param array  $acl    List of folder->right map
      * @param bool   $update Update (remove) old rights
+     *
+     * @return string On error returns an error label, on success returns null
      */
     public function delegate_acl_update($uid, $acl, $update = false)
     {
@@ -105,6 +112,9 @@ class kolab_delegation_engine
             if ($r) {
                 $storage->set_acl($folder_name, $uid, $r);
             }
+            else {
+                $storage->delete_acl($folder_name, $uid);
+            }
 
             if (!empty($folders) && isset($folders[$folder_name])) {
                 unset($folders[$folder_name]);
@@ -116,8 +126,6 @@ class kolab_delegation_engine
                 $storage->delete_acl($folder_name, $uid);
             }
         }
-
-        return true;
     }
 
     /**
@@ -125,6 +133,8 @@ class kolab_delegation_engine
      *
      * @param string $dn      Delegate DN (encoded)
      * @param bool   $acl_del Enable ACL deletion on delegator folders
+     *
+     * @return string On error returns an error label, on success returns null
      */
     public function delegate_delete($dn, $acl_del = false)
     {
@@ -133,7 +143,7 @@ class kolab_delegation_engine
         $user     = $this->user();
 
         if (empty($delegate) || !isset($list[$dn])) {
-            return false;
+            return 'deleteerror';
         }
 
         // remove delegate from the list
@@ -150,7 +160,7 @@ class kolab_delegation_engine
             $this->delegate_acl_update($delegate['uid'], array(), true);
         }
 
-        return $result;
+        return $result ? null : 'deleteerror';
     }
 
     /**
@@ -216,7 +226,29 @@ class kolab_delegation_engine
      */
     private function ldap()
     {
-        $ldap = kolab_auth::ldap();
+        if ($this->ldap !== null) {
+            return $this->ldap;
+        }
+
+        if ($addressbook = $this->rc->config->get('kolab_delegation_addressbook')) {
+            if (!is_array($addressbook)) {
+                $ldap_config = (array) $this->rc->config->get('ldap_public');
+                $addressbook = $ldap_config[$addressbook];
+            }
+
+            if (!empty($addressbook)) {
+                require_once __DIR__ . '/../kolab_auth/kolab_auth_ldap.php';
+
+                $ldap = new kolab_auth_ldap($addressbook);
+            }
+        }
+
+        // Fallback to kolab_auth plugin's addressbook
+        if (!$ldap) {
+            $ldap = kolab_auth::ldap();
+        }
+
+        $this->ldap = $ldap;
 
         if (!$ldap || !$ldap->ready) {
             return null;
@@ -230,13 +262,13 @@ class kolab_delegation_engine
         $this->ldap_dn = $_SESSION['kolab_dn'];
 
         // Name of the LDAP field with authentication ID
-        $this->ldap_login_field = $this->rc->config->get('kolab_auth_login');
+        $this->ldap_login_field = $this->rc->config->get('kolab_delegation_login_field', $this->rc->config->get('kolab_auth_login'));
         // Name of the LDAP field with user name used for identities
-        $this->ldap_name_field = $this->rc->config->get('kolab_auth_name');
+        $this->ldap_name_field = $this->rc->config->get('kolab_delegation_name_field', $this->rc->config->get('kolab_auth_name'));
         // Name of the LDAP field with email addresses used for identities
-        $this->ldap_email_field = $this->rc->config->get('kolab_auth_email');
+        $this->ldap_email_field = $this->rc->config->get('kolab_delegation_email_field', $this->rc->config->get('kolab_auth_email'));
         // Name of the LDAP field with organization name for identities
-        $this->ldap_org_field = $this->rc->config->get('kolab_auth_organization');
+        $this->ldap_org_field = $this->rc->config->get('kolab_delegation_organization_field', $this->rc->config->get('kolab_auth_organization'));
 
         $ldap->set_filter($this->ldap_filter);
         $ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
@@ -587,7 +619,7 @@ class kolab_delegation_engine
 
         if (!empty($delegators)) {
             $storage  = $this->rc->get_storage();
-            $other_ns = $storage->get_namespace('other');
+            $other_ns = $storage->get_namespace('other') ?: array();
             $folders  = $storage->list_folders();
         }
 
@@ -774,56 +806,79 @@ class kolab_delegation_engine
     }
 
     /**
-     * Filters list of calendars according to delegator context
+     * Filters list of calendar/task folders according to delegator context
      *
      * @param array $args Reference to plugin hook arguments
      */
-    public function delegator_folder_filter(&$args)
+    public function delegator_folder_filter(&$args, $mode = 'calendars')
     {
-        $context   = $this->delegator_context();
-        $storage   = $this->rc->get_storage();
-        $other_ns  = $storage->get_namespace('other');
-        $delim     = $storage->get_hierarchy_delimiter();
-        $calendars = array();
+        $context = $this->delegator_context();
 
-        // code parts derived from kolab_driver::filter_calendars()
-        foreach ($args['list'] as $cal) {
-            if (!$cal->ready) {
-                continue;
-            }
-            if ($args['writeable'] && $cal->readonly) {
-                continue;
-            }
-            if ($args['active'] && !$cal->storage->is_active()) {
-                continue;
-            }
-            if ($args['personal']) {
-                $ns   = $cal->get_namespace();
-
-                if (empty($context)) {
-                    if ($ns != 'personal') {
-                        continue;
-                    }
-                }
-                else {
-                    if ($ns != 'other') {
-                        continue;
-                    }
-
-                    foreach ($other_ns as $ns) {
-                        $folder = $ns[0] . $context . $delim;
-                        if (strpos($cal->name, $folder) !== 0) {
-                            continue;
-                        }
-                    }
-                }
-            }
-
-            $calendars[$cal->id] = $cal;
+        if (empty($context)) {
+            return $args;
         }
 
-        $args['calendars'] = $calendars;
-        $args['abort']     = true;
+        $storage  = $this->rc->get_storage();
+        $other_ns = $storage->get_namespace('other') ?: array();
+        $delim    = $storage->get_hierarchy_delimiter();
+
+        if ($mode == 'calendars') {
+            $editable = $args['filter'] & calendar_driver::FILTER_WRITEABLE;
+            $active   = $args['filter'] & calendar_driver::FILTER_ACTIVE;
+            $personal = $args['filter'] & calendar_driver::FILTER_PERSONAL;
+            $shared   = $args['filter'] & calendar_driver::FILTER_SHARED;
+        }
+        else {
+            $editable = $args['filter'] & tasklist_driver::FILTER_WRITEABLE;
+            $active   = $args['filter'] & tasklist_driver::FILTER_ACTIVE;
+            $personal = $args['filter'] & tasklist_driver::FILTER_PERSONAL;
+            $shared   = $args['filter'] & tasklist_driver::FILTER_SHARED;
+        }
+
+        $folders = array();
+
+        foreach ($args['list'] as $folder) {
+            if (isset($folder->ready) && !$folder->ready) {
+                continue;
+            }
+
+            if ($editable && !$folder->editable) {
+                continue;
+            }
+
+            if ($active && !$folder->storage->is_active()) {
+                continue;
+            }
+
+            if ($personal || $shared) {
+                $ns = $folder->get_namespace();
+
+                if ($personal && $ns == 'personal') {
+                    continue;
+                }
+                else if ($personal && $ns == 'other') {
+                    $found = false;
+                    foreach ($other_ns as $ns) {
+                        $c_folder = $ns[0] . $context . $delim;
+                        if (strpos($folder->name, $c_folder) === 0) {
+                            $found = true;
+                        }
+                    }
+
+                    if (!$found) {
+                        continue;
+                    }
+                }
+                else if (!$shared || $ns != 'shared') {
+                    continue;
+                }
+            }
+
+            $folders[$folder->id] = $folder;
+        }
+
+        $args[$mode]   = $folders;
+        $args['abort'] = true;
     }
 
     /**
@@ -863,12 +918,10 @@ class kolab_delegation_engine
     /**
      * Compares two ACLs (according to supported rights)
      *
-     * @todo: this is stolen from acl plugin, move to rcube_storage/rcube_imap
-     *
      * @param array $acl1 ACL rights array (or string)
      * @param array $acl2 ACL rights array (or string)
      *
-     * @param int Comparision result, 2 - full match, 1 - partial match, 0 - no match
+     * @param bool True if $acl1 contains all rights from $acl2
      */
     function acl_compare($acl1, $acl2)
     {
@@ -884,12 +937,9 @@ class kolab_delegation_engine
         $cnt1 = count($res);
         $cnt2 = count($acl2);
 
-        if ($cnt1 == $cnt2)
-            return 2;
-        else if ($cnt1)
-            return 1;
-        else
-            return 0;
+        if ($cnt1 >= $cnt2) {
+            return true;
+        }
     }
 
     /**
diff --git a/plugins/kolab_delegation/localization/bg.inc b/plugins/kolab_delegation/localization/bg.inc
new file mode 100644
index 00000000..6e91cec8
--- /dev/null
+++ b/plugins/kolab_delegation/localization/bg.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['task'] = 'Задачи';
+?>
diff --git a/plugins/kolab_delegation/localization/bg_BG.inc b/plugins/kolab_delegation/localization/bg_BG.inc
index 1b6445e7..164099f7 100644
--- a/plugins/kolab_delegation/localization/bg_BG.inc
+++ b/plugins/kolab_delegation/localization/bg_BG.inc
@@ -7,7 +7,7 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
 $labels['mail'] = 'Електронна поща';
-$labels['contact'] = 'Адресни книги';
+$labels['contact'] = 'Контакти';
 $labels['event'] = 'Календари';
 $labels['task'] = 'Задачи';
 $labels['note'] = 'Бележки';
diff --git a/plugins/kolab_delegation/localization/ca_ES.inc b/plugins/kolab_delegation/localization/ca_ES.inc
index 3038b4e2..c1e79942 100644
--- a/plugins/kolab_delegation/localization/ca_ES.inc
+++ b/plugins/kolab_delegation/localization/ca_ES.inc
@@ -6,6 +6,7 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['contact'] = 'Contacts';
 $labels['event'] = 'Calendaris';
 $labels['task'] = 'Tasques';
 $labels['deletedelegate'] = 'Delete delegate';
diff --git a/plugins/kolab_delegation/localization/cs_CZ.inc b/plugins/kolab_delegation/localization/cs_CZ.inc
index b9e032b9..0a33d050 100644
--- a/plugins/kolab_delegation/localization/cs_CZ.inc
+++ b/plugins/kolab_delegation/localization/cs_CZ.inc
@@ -11,7 +11,7 @@ $labels['delegationtitle'] = 'Spravovat zástupce';
 $labels['delegates'] = 'Zástupci';
 $labels['delegate'] = 'Zástupce';
 $labels['mail'] = 'E-mail';
-$labels['contact'] = 'Adresáře';
+$labels['contact'] = 'Spojení';
 $labels['event'] = 'Kalendáře';
 $labels['task'] = 'Úkoly';
 $labels['note'] = 'Poznámky';
diff --git a/plugins/kolab_delegation/localization/da_DK.inc b/plugins/kolab_delegation/localization/da_DK.inc
index ebc6c04f..b59bf75e 100644
--- a/plugins/kolab_delegation/localization/da_DK.inc
+++ b/plugins/kolab_delegation/localization/da_DK.inc
@@ -11,7 +11,7 @@ $labels['delegationtitle'] = 'Manage delegates';
 $labels['delegates'] = 'Delegerede';
 $labels['delegate'] = 'Delegér';
 $labels['mail'] = 'E-post';
-$labels['contact'] = 'Adressebøger';
+$labels['contact'] = 'Kontakter';
 $labels['event'] = 'Kalendere';
 $labels['task'] = 'Opgaver';
 $labels['note'] = 'Noter';
@@ -31,4 +31,6 @@ $labels['updatesuccess'] = 'Gennemførte opdatering af delegerede.';
 $labels['updateerror'] = 'Kunne ikke opdatere delegerede.';
 $labels['createsuccess'] = 'Gennemførte tilføjelse af den delegerede.';
 $labels['createerror'] = 'Kunne ikke tilføje delegerede.';
+$labels['arialabeldelegatedelete'] = 'Vindue til sletning af delegeret';
+$labels['arialabeldelegateform'] = 'Formular med egenskaber for delegeret';
 ?>
diff --git a/plugins/kolab_delegation/localization/de_CH.inc b/plugins/kolab_delegation/localization/de_CH.inc
index 95b109b8..caef4c20 100644
--- a/plugins/kolab_delegation/localization/de_CH.inc
+++ b/plugins/kolab_delegation/localization/de_CH.inc
@@ -7,6 +7,7 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
 $labels['tabtitle'] = 'Vertretung';
+$labels['delegationtitle'] = 'Verwalte Vertreter';
 $labels['delegates'] = 'Vertreter';
 $labels['delegate'] = 'Vertreter';
 $labels['mail'] = 'E-Mail';
@@ -16,6 +17,8 @@ $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
 $labels['yes'] = 'Ja';
 $labels['no'] = 'Nein';
+$labels['read'] = 'Schreibgeschützt';
+$labels['write'] = 'Schreiben';
 $labels['adddelegate'] = 'Vertreter hinzufügen';
 $labels['deletedelegate'] = 'Vertreter löschen';
 $labels['savingdata'] = 'Speichere Daten...';
@@ -28,4 +31,6 @@ $labels['updatesuccess'] = 'Der Vertreter wurde erfolgreich aktualisiert.';
 $labels['updateerror'] = 'Vertreter konnte nicht aktualisiert werden.';
 $labels['createsuccess'] = 'Der Vertreter wurde erfolgreich hinzugefügt.';
 $labels['createerror'] = 'Vertreter konnte nicht hinzugefügt werden.';
+$labels['arialabeldelegatedelete'] = 'Vertreter Löschen Dialog';
+$labels['arialabeldelegateform'] = 'Verterter Eigenschaften Maske';
 ?>
diff --git a/plugins/kolab_delegation/localization/de_DE.inc b/plugins/kolab_delegation/localization/de_DE.inc
index 046bd7d1..8c99210b 100644
--- a/plugins/kolab_delegation/localization/de_DE.inc
+++ b/plugins/kolab_delegation/localization/de_DE.inc
@@ -25,7 +25,7 @@ $labels['savingdata'] = 'Speichere Daten...';
 $labels['delegatedeleteconfirm'] = 'Willst du wirklich diesen Vertreter löschen?';
 $labels['delegateremoveacl'] = 'Entferne Zugriffsberechtigungen auf den für diesen Benutzer zugewiesenen Ordnern.';
 $labels['deleteconfirm'] = 'Bestätigung';
-$labels['deletesuccess'] = 'Der Vertreter wirde erfolgreich entfernt.';
+$labels['deletesuccess'] = 'Der Vertreter wurde erfolgreich entfernt';
 $labels['deleteerror'] = 'Konnte Vertreter nicht entfernen.';
 $labels['updatesuccess'] = 'Der Vertreter wurde erfolgreich aktualisiert.';
 $labels['updateerror'] = 'Konnte Verteter nicht aktualisieren';
diff --git a/plugins/kolab_delegation/localization/el.inc b/plugins/kolab_delegation/localization/el.inc
new file mode 100644
index 00000000..a9bff997
--- /dev/null
+++ b/plugins/kolab_delegation/localization/el.inc
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['mail'] = 'Ηλεκτρονική αλληλογραφία';
+$labels['contact'] = 'Επαφές';
+$labels['event'] = 'Ημερολόγια';
+$labels['task'] = 'Εργασίες';
+$labels['note'] = 'Σημειώσεις';
+$labels['yes'] = 'Ναι';
+$labels['no'] = 'Όχι';
+$labels['write'] = 'Εγγραφή';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+?>
diff --git a/plugins/kolab_delegation/localization/en_US.inc b/plugins/kolab_delegation/localization/en_US.inc
index 94ceb9e7..cf69e6a2 100644
--- a/plugins/kolab_delegation/localization/en_US.inc
+++ b/plugins/kolab_delegation/localization/en_US.inc
@@ -14,8 +14,10 @@ $labels['tabtitle'] = 'Delegation';
 $labels['delegationtitle'] = 'Manage delegates';
 $labels['delegates'] = 'Delegates';
 $labels['delegate'] = 'Delegate';
+$labels['delegatefolders'] = 'Delegated folders';
+$labels['delegateprops'] = 'Delegate properties';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
+$labels['contact'] = 'Contacts';
 $labels['event'] = 'Calendars';
 $labels['task'] = 'Tasks';
 $labels['note'] = 'Notes';
diff --git a/plugins/kolab_delegation/localization/es_AR.inc b/plugins/kolab_delegation/localization/es_AR.inc
index f3fefdb9..aa00b7ea 100644
--- a/plugins/kolab_delegation/localization/es_AR.inc
+++ b/plugins/kolab_delegation/localization/es_AR.inc
@@ -10,8 +10,10 @@ $labels['tabtitle'] = 'Delegación';
 $labels['delegationtitle'] = 'Administrar delegados';
 $labels['delegates'] = 'Delegados';
 $labels['delegate'] = 'Delegado';
+$labels['delegatefolders'] = 'Carpetas delegadas';
+$labels['delegateprops'] = 'Propiedades delegadas';
 $labels['mail'] = 'Correo electrónico';
-$labels['contact'] = 'Libreta de direcciones';
+$labels['contact'] = 'Contactos';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
diff --git a/plugins/kolab_delegation/localization/es_ES.inc b/plugins/kolab_delegation/localization/es_ES.inc
index 859bef2c..9180514d 100644
--- a/plugins/kolab_delegation/localization/es_ES.inc
+++ b/plugins/kolab_delegation/localization/es_ES.inc
@@ -6,14 +6,31 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['tabtitle'] = 'Delegación';
+$labels['delegationtitle'] = 'Gestionar delegados';
 $labels['delegates'] = 'Delegados';
+$labels['delegate'] = 'Delegado';
 $labels['mail'] = 'Correo electrónico';
-$labels['contact'] = 'Libreta de direcciones';
+$labels['contact'] = 'Contactos';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
 $labels['yes'] = 'Sí';
 $labels['no'] = 'No';
 $labels['read'] = 'Solo-lectura';
+$labels['write'] = 'Escribir';
+$labels['adddelegate'] = 'Añadir delegado';
+$labels['deletedelegate'] = 'Borrar delegado';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['delegatedeleteconfirm'] = '¿Esta seguro de eliminar este delegado?';
+$labels['delegateremoveacl'] = 'retirar los derechos de acceso de todas las carpetas asignadas a este usuario';
+$labels['deleteconfirm'] = 'Confirmación';
+$labels['deletesuccess'] = 'El delegado se ha eliminado con éxito';
+$labels['deleteerror'] = 'No es posible eliminar al delegado.';
+$labels['updatesuccess'] = 'El delegado se ha actualizado con éxito.';
+$labels['updateerror'] = 'No es posible actualizar al delegado.';
+$labels['createsuccess'] = 'El delegado se ha añadido con éxito.';
+$labels['createerror'] = 'No es posible añadir al delegado.';
+$labels['arialabeldelegatedelete'] = 'Diálogo de eliminación del delegado';
+$labels['arialabeldelegateform'] = 'Formulario de propiedades del delegado';
 ?>
diff --git a/plugins/kolab_delegation/localization/et_EE.inc b/plugins/kolab_delegation/localization/et_EE.inc
index b0f0b680..75c1f2d4 100644
--- a/plugins/kolab_delegation/localization/et_EE.inc
+++ b/plugins/kolab_delegation/localization/et_EE.inc
@@ -6,5 +6,17 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['delegates'] = 'Delegaadid';
+$labels['delegate'] = 'Delegeeri';
 $labels['mail'] = 'E-post';
+$labels['contact'] = 'Kontaktid';
+$labels['event'] = 'Kalendrid';
+$labels['task'] = 'Ülesanded';
+$labels['note'] = 'Märkmed';
+$labels['yes'] = 'Jah';
+$labels['no'] = 'Ei';
+$labels['read'] = 'Ainult loetav';
+$labels['write'] = 'Kirjuta';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['deleteconfirm'] = 'Kinnitamine';
 ?>
diff --git a/plugins/kolab_delegation/localization/fi_FI.inc b/plugins/kolab_delegation/localization/fi_FI.inc
index b63333b5..f627349f 100644
--- a/plugins/kolab_delegation/localization/fi_FI.inc
+++ b/plugins/kolab_delegation/localization/fi_FI.inc
@@ -11,7 +11,7 @@ $labels['delegationtitle'] = 'Hallitse edustajia';
 $labels['delegates'] = 'Edustajat';
 $labels['delegate'] = 'Edustaja';
 $labels['mail'] = 'Sähköposti';
-$labels['contact'] = 'Osoitekirjat';
+$labels['contact'] = 'Yhteystiedot';
 $labels['event'] = 'Kalenterit';
 $labels['task'] = 'Tehtävät';
 $labels['note'] = 'Muistiot';
diff --git a/plugins/kolab_delegation/localization/fr_FR.inc b/plugins/kolab_delegation/localization/fr_FR.inc
index 8a86d91e..24426035 100644
--- a/plugins/kolab_delegation/localization/fr_FR.inc
+++ b/plugins/kolab_delegation/localization/fr_FR.inc
@@ -7,30 +7,30 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
 $labels['tabtitle'] = 'Délégation';
-$labels['delegationtitle'] = 'Gérer mainteneurs';
+$labels['delegationtitle'] = 'Gérer les délégations';
 $labels['delegates'] = 'Délégation';
 $labels['delegate'] = 'Déléguer';
 $labels['mail'] = 'Adresse de messagerie';
-$labels['contact'] = 'Carnet d\'adresse';
+$labels['contact'] = 'Contacts';
 $labels['event'] = 'Calendriers';
 $labels['task'] = 'Tâches';
 $labels['note'] = 'Notes';
 $labels['yes'] = 'Oui';
 $labels['no'] = 'Non';
-$labels['read'] = 'Lecture Seule';
+$labels['read'] = 'Lecture seule';
 $labels['write'] = 'Écriture';
 $labels['adddelegate'] = 'Ajouter une délégation';
 $labels['deletedelegate'] = 'Supprimer une délégation';
 $labels['savingdata'] = 'Enregistrer...';
-$labels['delegatedeleteconfirm'] = 'Voulez-vous vraiment supprimer cette délégation?';
+$labels['delegatedeleteconfirm'] = 'Voulez-vous vraiment supprimer cette délégation ?';
 $labels['delegateremoveacl'] = 'Supprimer les droits d\'accès aux dossiers affectés à cet utilisateur';
 $labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'La délégation a été supprimée';
-$labels['deleteerror'] = 'La délégation n\'a pas pu être supprimée';
-$labels['updatesuccess'] = 'La délégation a été mise à jour';
-$labels['updateerror'] = 'La délégation n\'a pas pu être mise à jour';
-$labels['createsuccess'] = 'La délégation a été ajoutée';
-$labels['createerror'] = 'La délégation n\'a pas pu être ajoutée';
-$labels['arialabeldelegatedelete'] = 'Dialog de suppression du mainteneur';
-$labels['arialabeldelegateform'] = 'Formulaire de propriétés du mainteneur';
+$labels['deletesuccess'] = 'La délégation a été supprimée.';
+$labels['deleteerror'] = 'La délégation n\'a pas pu être supprimée.';
+$labels['updatesuccess'] = 'La délégation a été mise à jour.';
+$labels['updateerror'] = 'La délégation n\'a pas pu être mise à jour.';
+$labels['createsuccess'] = 'La délégation a été ajoutée.';
+$labels['createerror'] = 'La délégation n\'a pas pu être ajoutée.';
+$labels['arialabeldelegatedelete'] = 'Fenêtre de suppression de la délégation';
+$labels['arialabeldelegateform'] = 'Formulaire de propriétés de la délégation';
 ?>
diff --git a/plugins/kolab_delegation/localization/hr_HR.inc b/plugins/kolab_delegation/localization/hr_HR.inc
new file mode 100644
index 00000000..07f509bb
--- /dev/null
+++ b/plugins/kolab_delegation/localization/hr_HR.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['event'] = 'Kalendari';
+?>
diff --git a/plugins/kolab_delegation/localization/hu_HU.inc b/plugins/kolab_delegation/localization/hu_HU.inc
index c4c2ac45..8ce60019 100644
--- a/plugins/kolab_delegation/localization/hu_HU.inc
+++ b/plugins/kolab_delegation/localization/hu_HU.inc
@@ -10,7 +10,7 @@ $labels['tabtitle'] = 'Meghatalmazás';
 $labels['delegates'] = 'Meghatalmazottak';
 $labels['delegate'] = 'Meghatalmazott:';
 $labels['mail'] = 'E-mail';
-$labels['contact'] = 'Címjegyzékek';
+$labels['contact'] = 'Kapcsolatok';
 $labels['event'] = 'Naptárak';
 $labels['task'] = 'Feladatok';
 $labels['note'] = 'Jegyzetek';
diff --git a/plugins/kolab_delegation/localization/it_IT.inc b/plugins/kolab_delegation/localization/it_IT.inc
index 7c5221a4..c263b1b4 100644
--- a/plugins/kolab_delegation/localization/it_IT.inc
+++ b/plugins/kolab_delegation/localization/it_IT.inc
@@ -11,7 +11,7 @@ $labels['delegationtitle'] = 'Gestisci delegati';
 $labels['delegates'] = 'Delegati';
 $labels['delegate'] = 'Delegato';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Rubriche';
+$labels['contact'] = 'Contatti';
 $labels['event'] = 'Calendari';
 $labels['task'] = 'Attività';
 $labels['note'] = 'Note';
diff --git a/plugins/kolab_delegation/localization/ja_JP.inc b/plugins/kolab_delegation/localization/ja_JP.inc
index 4e553bb0..c9526c4f 100644
--- a/plugins/kolab_delegation/localization/ja_JP.inc
+++ b/plugins/kolab_delegation/localization/ja_JP.inc
@@ -6,26 +6,31 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
-$labels['tabtitle'] = '委任';
-$labels['delegates'] = '委任者';
-$labels['delegate'] = '委任者';
-$labels['contact'] = 'アドレス帳';
+$labels['tabtitle'] = '代理';
+$labels['delegationtitle'] = '代理人の管理';
+$labels['delegates'] = '代理人';
+$labels['delegate'] = '代理人';
+$labels['mail'] = 'Eメール';
+$labels['contact'] = 'コンタクト';
 $labels['event'] = 'カレンダー';
 $labels['task'] = 'タスク';
 $labels['note'] = 'ノート';
 $labels['yes'] = 'はい';
 $labels['no'] = 'いいえ';
 $labels['read'] = '読込のみ';
-$labels['adddelegate'] = '委任者を追加';
-$labels['deletedelegate'] = '委任者を削除';
+$labels['write'] = '書込';
+$labels['adddelegate'] = '代理人を追加';
+$labels['deletedelegate'] = '代理人を削除';
 $labels['savingdata'] = 'データを保存中…';
-$labels['delegatedeleteconfirm'] = 'この委任者を本当に削除しますか？';
+$labels['delegatedeleteconfirm'] = 'この代理人を本当に削除しますか？';
 $labels['delegateremoveacl'] = 'このユーザにアサインされたフォルダのアクセス権を削除しました';
 $labels['deleteconfirm'] = '確認';
-$labels['deletesuccess'] = '委任者の削除に成功しました';
-$labels['deleteerror'] = '委任者の削除ができません。';
-$labels['updatesuccess'] = '委任者の更新に成功しました。';
-$labels['updateerror'] = '委任者の更新ができません。';
-$labels['createsuccess'] = '委任者の追加に成功しました。';
-$labels['createerror'] = '委任者の追加ができません。';
+$labels['deletesuccess'] = '代理人の削除に成功しました';
+$labels['deleteerror'] = '代理人の削除ができません。';
+$labels['updatesuccess'] = '代理人の更新に成功しました。';
+$labels['updateerror'] = '代理人の更新ができません。';
+$labels['createsuccess'] = '代理人の追加に成功しました。';
+$labels['createerror'] = '代理人の追加ができません。';
+$labels['arialabeldelegatedelete'] = '代理人削除ダイアログ';
+$labels['arialabeldelegateform'] = '代理人プロパティフォーム';
 ?>
diff --git a/plugins/kolab_delegation/localization/ko_KR.inc b/plugins/kolab_delegation/localization/ko_KR.inc
new file mode 100644
index 00000000..d9852c72
--- /dev/null
+++ b/plugins/kolab_delegation/localization/ko_KR.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['event'] = '캘린더';
+$labels['savingdata'] = '자료 저장중...';
+?>
diff --git a/plugins/kolab_delegation/localization/lv.inc b/plugins/kolab_delegation/localization/lv.inc
new file mode 100644
index 00000000..ecbbe24a
--- /dev/null
+++ b/plugins/kolab_delegation/localization/lv.inc
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['delegate'] = 'Deleģēt';
+$labels['mail'] = 'E-pasts';
+$labels['event'] = 'Kalendāri';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['deleteconfirm'] = 'Apstiprinājums';
+?>
diff --git a/plugins/kolab_delegation/localization/nl_NL.inc b/plugins/kolab_delegation/localization/nl_NL.inc
index 33df5aa9..019da410 100644
--- a/plugins/kolab_delegation/localization/nl_NL.inc
+++ b/plugins/kolab_delegation/localization/nl_NL.inc
@@ -7,12 +7,12 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
 $labels['tabtitle'] = 'Delegatie';
-$labels['delegationtitle'] = 'Manage delegates';
+$labels['delegationtitle'] = 'Gedelegeerden beheren';
 $labels['delegates'] = 'Gedelegeerden';
 $labels['delegate'] = 'Gedelegeerde';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Adresboeken';
-$labels['event'] = 'Kalenders';
+$labels['mail'] = 'E-mail';
+$labels['contact'] = 'Contactpersonen';
+$labels['event'] = 'Agenda\'s';
 $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['yes'] = 'Ja';
@@ -21,16 +21,16 @@ $labels['read'] = 'Alleen-lezen';
 $labels['write'] = 'Schrijven';
 $labels['adddelegate'] = 'Gedelegeerde toevoegen';
 $labels['deletedelegate'] = 'Gedelegeerde verwijderen';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['delegatedeleteconfirm'] = 'Wilt u deze gedelegeerde echt verwijderen?';
-$labels['delegateremoveacl'] = 'verwijder toegangsrechten op mappen toegewezen aan deze gebruiker';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['delegatedeleteconfirm'] = 'Weet u zeker dat u deze gedelegeerde wilt verwijderen?';
+$labels['delegateremoveacl'] = 'toegangsrechten voor mappen toegewezen aan deze gebruiker verwijderen';
 $labels['deleteconfirm'] = 'Bevestiging';
-$labels['deletesuccess'] = 'De gedelegeerde is succesvol verwijderd.';
+$labels['deletesuccess'] = 'De gedelegeerde is met succes verwijderd.';
 $labels['deleteerror'] = 'De gedelegeerde kon niet worden verwijderd.';
-$labels['updatesuccess'] = 'De gedelegeerde is succesvol gewijzigd.';
-$labels['updateerror'] = 'De gedelegeerde kon niet worden gewijzigd.';
-$labels['createsuccess'] = 'De gedelegeerde is succesvol toegevoegd.';
+$labels['updatesuccess'] = 'De gedelegeerde is met succes bijgewerkt.';
+$labels['updateerror'] = 'De gedelegeerde kon niet worden bijgewerkt.';
+$labels['createsuccess'] = 'De gedelegeerde is met succes toegevoegd.';
 $labels['createerror'] = 'De gedelegeerde kon niet worden toegevoegd.';
-$labels['arialabeldelegatedelete'] = 'Delegate deletion dialog';
-$labels['arialabeldelegateform'] = 'Delegate properties form';
+$labels['arialabeldelegatedelete'] = 'Dialoogvenster voor verwijdering van gedelegeerde';
+$labels['arialabeldelegateform'] = 'Formulier voor eigenschappen van gedelegeerde';
 ?>
diff --git a/plugins/kolab_delegation/localization/pl_PL.inc b/plugins/kolab_delegation/localization/pl_PL.inc
index 9581576d..62d55559 100644
--- a/plugins/kolab_delegation/localization/pl_PL.inc
+++ b/plugins/kolab_delegation/localization/pl_PL.inc
@@ -6,31 +6,7 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
-$labels['tabtitle'] = 'Pełnomocnictwa';
-$labels['delegationtitle'] = 'Zarządzaj delegatami';
-$labels['delegates'] = 'Wydelegowani';
-$labels['delegate'] = 'Pełnomocnik';
-$labels['mail'] = 'Poczta';
-$labels['contact'] = 'Książki adresowe';
 $labels['event'] = 'Kalendarze';
 $labels['task'] = 'Zadania';
-$labels['note'] = 'Notatki';
-$labels['yes'] = 'Tak';
-$labels['no'] = 'Nie';
-$labels['read'] = 'Tylko-do-odczytu';
-$labels['write'] = 'Zapis';
-$labels['adddelegate'] = 'Dodaj delegata';
-$labels['deletedelegate'] = 'Usuń delegata';
 $labels['savingdata'] = 'Zapisuję dane...';
-$labels['delegatedeleteconfirm'] = 'Czy na pewno chcesz usunąć tego delegata?';
-$labels['delegateremoveacl'] = 'usuń prawa dostępu do folderów przypisanych do tego użytkownika';
-$labels['deleteconfirm'] = 'Potwierdzenie';
-$labels['deletesuccess'] = 'Delegat został usunięty.';
-$labels['deleteerror'] = 'Nie można usunąć delegata.';
-$labels['updatesuccess'] = 'Delegat został zaktualizowany.';
-$labels['updateerror'] = 'Nie można zaktualizować delegata.';
-$labels['createsuccess'] = 'Delegat został dodany.';
-$labels['createerror'] = 'Nie można dodać delegata.';
-$labels['arialabeldelegatedelete'] = 'Okno usuwania delegata';
-$labels['arialabeldelegateform'] = 'Formularz właściwości delegata';
 ?>
diff --git a/plugins/kolab_delegation/localization/pt_BR.inc b/plugins/kolab_delegation/localization/pt_BR.inc
index 26a39908..5acfa83e 100644
--- a/plugins/kolab_delegation/localization/pt_BR.inc
+++ b/plugins/kolab_delegation/localization/pt_BR.inc
@@ -10,7 +10,7 @@ $labels['tabtitle'] = 'Delegação';
 $labels['delegates'] = 'Delegados';
 $labels['delegate'] = 'Delegado';
 $labels['mail'] = 'E-mail';
-$labels['contact'] = 'Catálogo de endereços';
+$labels['contact'] = 'Contatos';
 $labels['event'] = 'Calendários';
 $labels['task'] = 'Tarefas';
 $labels['note'] = 'Notas';
diff --git a/plugins/kolab_delegation/localization/pt_PT.inc b/plugins/kolab_delegation/localization/pt_PT.inc
index b888ea54..72316ac7 100644
--- a/plugins/kolab_delegation/localization/pt_PT.inc
+++ b/plugins/kolab_delegation/localization/pt_PT.inc
@@ -6,6 +6,9 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['mail'] = 'Email';
 $labels['event'] = 'Calendários';
+$labels['task'] = 'Tarefas';
+$labels['note'] = 'Notas';
 $labels['savingdata'] = 'Salvando dados...';
 ?>
diff --git a/plugins/kolab_delegation/localization/ru_RU.inc b/plugins/kolab_delegation/localization/ru_RU.inc
index ab5ec953..a0bfc68f 100644
--- a/plugins/kolab_delegation/localization/ru_RU.inc
+++ b/plugins/kolab_delegation/localization/ru_RU.inc
@@ -11,7 +11,7 @@ $labels['delegationtitle'] = 'Управление представителям
 $labels['delegates'] = 'Представители';
 $labels['delegate'] = 'Представитель';
 $labels['mail'] = 'Почта';
-$labels['contact'] = 'Адресные книги';
+$labels['contact'] = 'Контакты';
 $labels['event'] = 'Календари';
 $labels['task'] = 'Задачи';
 $labels['note'] = 'Заметки';
diff --git a/plugins/kolab_delegation/localization/sk_SK.inc b/plugins/kolab_delegation/localization/sk_SK.inc
new file mode 100644
index 00000000..b61cbb91
--- /dev/null
+++ b/plugins/kolab_delegation/localization/sk_SK.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['event'] = 'Kalendáre';
+?>
diff --git a/plugins/kolab_delegation/localization/sl_SI.inc b/plugins/kolab_delegation/localization/sl_SI.inc
new file mode 100644
index 00000000..ec610a16
--- /dev/null
+++ b/plugins/kolab_delegation/localization/sl_SI.inc
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['tabtitle'] = 'Prenos nalog';
+$labels['delegationtitle'] = 'Uredi sodelujoče';
+$labels['delegates'] = 'Sodelujoči';
+$labels['delegate'] = 'Sodelujoč';
+$labels['mail'] = 'Email';
+$labels['contact'] = 'Kontakti';
+$labels['event'] = 'Koledarji';
+$labels['task'] = 'Naloge';
+$labels['note'] = 'Zapiski';
+$labels['yes'] = 'Da';
+$labels['no'] = 'Ne';
+$labels['read'] = 'Samo za branje';
+$labels['write'] = 'Zapiši';
+$labels['adddelegate'] = 'Dodaj sodelujočega';
+$labels['deletedelegate'] = 'Izbriši sodelujočega';
+$labels['savingdata'] = 'Shranjujem...';
+$labels['delegatedeleteconfirm'] = 'Ali želite potrditi brisanje sodelujočega?';
+$labels['delegateremoveacl'] = 'odstrani pravice za dostop do mape za tega uporabnika';
+$labels['deleteconfirm'] = 'Potrditev';
+$labels['deletesuccess'] = 'Ta sodelujoči je bil uspešno odstranjen.';
+$labels['deleteerror'] = 'Napaka. Ne morem odstraniti sodelujočega.';
+$labels['updatesuccess'] = 'Stanje sodelujočega je bilo uspešno posodobljeno.';
+$labels['updateerror'] = 'Ne morem posodobiti stanja sodelujočega.';
+$labels['createsuccess'] = 'Sodelujoči je bil uspešno dodan.';
+$labels['createerror'] = 'Ne morem dodati sodelujočega.';
+$labels['arialabeldelegatedelete'] = 'Izbrisani dogodki s sodelujočim';
+$labels['arialabeldelegateform'] = 'Obrazec za nastavitve sodelujočih';
+?>
diff --git a/plugins/kolab_delegation/localization/sv_SE.inc b/plugins/kolab_delegation/localization/sv_SE.inc
index fff61037..c6b7181c 100644
--- a/plugins/kolab_delegation/localization/sv_SE.inc
+++ b/plugins/kolab_delegation/localization/sv_SE.inc
@@ -6,31 +6,9 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
-$labels['tabtitle'] = 'Delegering';
-$labels['delegationtitle'] = 'Hantera ombud';
-$labels['delegates'] = 'Ombud';
-$labels['delegate'] = 'Delegera';
-$labels['mail'] = 'E-post';
-$labels['contact'] = 'Adressböcker';
+$labels['contact'] = 'Kontakter';
 $labels['event'] = 'Kalendrar';
 $labels['task'] = 'Uppgifter';
 $labels['note'] = 'Anteckningar';
-$labels['yes'] = 'Ja';
-$labels['no'] = 'Nej';
-$labels['read'] = 'Endast läsbar';
-$labels['write'] = 'Skriv';
-$labels['adddelegate'] = 'Lägg till ombud';
-$labels['deletedelegate'] = 'Ta bort ombud';
 $labels['savingdata'] = 'Sparar data ...';
-$labels['delegatedeleteconfirm'] = 'Vill du verkligen ta bort detta ombud?';
-$labels['delegateremoveacl'] = 'ta bort åtkomsträttigheter för mappar som tilldelats denna användare';
-$labels['deleteconfirm'] = 'Bekräftelse';
-$labels['deletesuccess'] = 'Ombudet togs bort.';
-$labels['deleteerror'] = 'Ombudet kunde inte tas bort.';
-$labels['updatesuccess'] = 'Detta ombud uppdaterades.';
-$labels['updateerror'] = 'Ombudet kunde inte uppdateras.';
-$labels['createsuccess'] = 'Ombudet lades till.';
-$labels['createerror'] = 'Ombudet kunde inte läggas till.';
-$labels['arialabeldelegatedelete'] = 'Borttagningsdialog för ombud';
-$labels['arialabeldelegateform'] = 'Egenskapsformulär för ombud';
 ?>
diff --git a/plugins/kolab_delegation/localization/th_TH.inc b/plugins/kolab_delegation/localization/th_TH.inc
new file mode 100644
index 00000000..758fb12f
--- /dev/null
+++ b/plugins/kolab_delegation/localization/th_TH.inc
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['tabtitle'] = 'การมอบหมายงาน';
+$labels['delegationtitle'] = 'การจัดการการมอบหมายงาน';
+$labels['mail'] = 'อีเมล์';
+$labels['contact'] = 'รายชื้อผู้ติดต่อ';
+$labels['event'] = 'ปฎิทิน';
+$labels['task'] = 'งาน';
+$labels['note'] = 'บันทึก';
+$labels['yes'] = 'ใช่';
+$labels['no'] = 'ไม่';
+$labels['read'] = 'อ่านเท่านั้น';
+$labels['write'] = 'เขียน';
+$labels['adddelegate'] = 'เพิ่ม(ผู้รับ/การ)มอบงาน';
+$labels['deletedelegate'] = 'ลบ(ผู้รับ/การ)มอบงาน';
+$labels['savingdata'] = 'บันทึกข้อมูล';
+$labels['delegatedeleteconfirm'] = 'คุณแน่ใจว่าต้องการยกเลิก(ผู้รับ/การ)มอบงานนี้หรือ';
+$labels['delegateremoveacl'] = 'ยกเลิกสิทธิการเข้าถึงแฟ้มของผู้ใช้รายนี้';
+$labels['deleteconfirm'] = 'การยืนยัน';
+$labels['deletesuccess'] = '(ผู้รับ/การ)มอบงานถูกลบเรียบร้อยแล้ว';
+$labels['deleteerror'] = 'ไม่สามารถลบการมอบหมายงานได้';
+$labels['updatesuccess'] = '(ผู้รับ/การ)มอบงานถูกปรับปรุงเรียบร้อยแล้ว';
+$labels['updateerror'] = 'ไม่สามารถปรับปรุง(ผู้รับ/การ)มอบงานได้';
+$labels['createsuccess'] = '(ผู้รับ/การ)มอบงานถูกเพิ่มเรียบร้อยแล้ว';
+$labels['createerror'] = 'ไม่สามารถเพิ่ม(ผู้รับ/การ)มอบงานได้';
+?>
diff --git a/plugins/kolab_delegation/localization/uk_UA.inc b/plugins/kolab_delegation/localization/uk_UA.inc
new file mode 100644
index 00000000..33e60e1f
--- /dev/null
+++ b/plugins/kolab_delegation/localization/uk_UA.inc
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['delegates'] = 'Представники';
+$labels['delegate'] = 'Представник';
+$labels['mail'] = 'Пошта';
+$labels['event'] = 'Календарі';
+$labels['task'] = 'Задачі';
+$labels['note'] = 'Нотатки';
+$labels['yes'] = 'Так';
+$labels['no'] = 'Ні';
+$labels['read'] = 'Тільки для читання';
+$labels['write'] = 'Запис';
+$labels['adddelegate'] = 'Додати представника';
+$labels['deletedelegate'] = 'Вилучити представника';
+$labels['savingdata'] = 'Збереження даних...';
+$labels['deleteconfirm'] = 'Підтвердження';
+?>
diff --git a/plugins/kolab_delegation/localization/zh_CN.inc b/plugins/kolab_delegation/localization/zh_CN.inc
index dc33e6c2..ed34a591 100644
--- a/plugins/kolab_delegation/localization/zh_CN.inc
+++ b/plugins/kolab_delegation/localization/zh_CN.inc
@@ -6,6 +6,8 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['mail'] = '邮件';
 $labels['note'] = '笔记';
+$labels['read'] = '只读';
 $labels['savingdata'] = '保存数据...';
 ?>
diff --git a/plugins/kolab_delegation/skins/classic/deviceactions.png b/plugins/kolab_delegation/skins/classic/deviceactions.png
deleted file mode 100644
index a542df91..00000000
Binary files a/plugins/kolab_delegation/skins/classic/deviceactions.png and /dev/null differ
diff --git a/plugins/kolab_delegation/skins/classic/foldertypes.png b/plugins/kolab_delegation/skins/classic/foldertypes.png
deleted file mode 100644
index 4950296a..00000000
Binary files a/plugins/kolab_delegation/skins/classic/foldertypes.png and /dev/null differ
diff --git a/plugins/kolab_delegation/skins/classic/read.png b/plugins/kolab_delegation/skins/classic/read.png
deleted file mode 100644
index cbc3b35e..00000000
Binary files a/plugins/kolab_delegation/skins/classic/read.png and /dev/null differ
diff --git a/plugins/kolab_delegation/skins/classic/style.css b/plugins/kolab_delegation/skins/classic/style.css
deleted file mode 100644
index eff69a7f..00000000
--- a/plugins/kolab_delegation/skins/classic/style.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Stylesheets for the Kolab ActiveSync configuration UI */
-
-#delegates-table {
-	width: 100%;
-	table-layout: fixed;
-	cursor: default;
-}
-
-.boxfooter a.button.delete,
-.boxfooter a.buttonPas.delete {
-	background-image: url(deviceactions.png);
-}
-
-div.foldersblock {
-	float: left;
-	margin: 0.5em 3em 2em 0;
-	padding: 0;
-	border: 1px solid #ddd;
-}
-
-div.foldersblock h3 {
-	font-size: 12px;
-	color: #333;
-	margin: 0 0 0.4em 0;
-	padding: 4px 4px 0 30px;
-	background: url(foldertypes.png) 5px 4px no-repeat #eee;
-}
-
-div.foldersblock h3.contact {
-	background-position: 5px -16px;
-}
-
-div.foldersblock h3.event {
-	background-position: 5px -36px;
-}
-
-div.foldersblock h3.task {
-	background-position: 5px -56px;
-}
-
-div.foldersblock h3.note {
-	background-position: 5px -76px;
-}
-
-#delegatefolders thead th {
-	color: #999;
-	font-weight: bold;
-	padding: 2px;
-	text-align: center;
-}
-
-#delegatefolders thead tr th {
-	border-top: 1px solid #ddd;
-}
-
-#delegatefolders thead th.read,
-#delegatefolders thead th.write {
-	cursor: pointer;
-}
-
-#delegatefolders thead th.foldername {
-    text-align: left;
-}
-
-#delegatefolders tbody td {
-	padding: 1px 2px;
-	border-top: 1px solid #ddd;
-	background-color: white;
-}
-
-#delegatefolders td label {
-	display: block;
-}
-
-#delegatefolders td.mailbox {
-	min-width: 12em;
-	padding-right: 10px;
-}
-
-#delegatefolders td.virtual {
-	color: #999;
-}
-
-#delegatefolders {
-	overflow: auto;
-	margin-top: 0.5em;
-}
-
-#delegate-delete-dialog {
-	display: none;
-}
-
-#delegate-delete-dialog p {
-	font-weight: bold;
-}
diff --git a/plugins/kolab_delegation/skins/classic/templates/editform.html b/plugins/kolab_delegation/skins/classic/templates/editform.html
deleted file mode 100644
index ff837310..00000000
--- a/plugins/kolab_delegation/skins/classic/templates/editform.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="iframe">
-
-<div id="prefs-title" class="boxtitle"><roundcube:label name="kolab_delegation.delegate"></div>
-
-<div id="prefs-details" class="boxcontent">
-	<form action="#" method="post" id="delegateform">
-		<roundcube:object name="plugin.delegateform" form="delegateform" class="propform" />
-		<roundcube:object name="plugin.delegatefolders" form="delegateform" id="delegatefolders" readicon="read.png" writeicon="write.png" />
-	</form>
-	<div id="formfooter">
-		<div class="footerleft">
-			<roundcube:button type="input" class="button mainaction" command="delegate-save" label="save" />
-		</div>
-	</div>
-</div>
-
-</body>
-</html>
diff --git a/plugins/kolab_delegation/skins/classic/templates/settings.html b/plugins/kolab_delegation/skins/classic/templates/settings.html
deleted file mode 100644
index af75c322..00000000
--- a/plugins/kolab_delegation/skins/classic/templates/settings.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="sectionslist">
-	<div id="delegateslist-title" class="boxtitle"><roundcube:label name="kolab_delegation.delegates" /></div>
-	<div class="boxlistcontent">
-		<roundcube:object name="plugin.delegatelist" id="delegates-table" class="records-table" cellspacing="0" />
-	</div>
-	<div class="boxfooter">
-		<roundcube:button command="delegate-add" type="link" title="kolab_delegation.adddelegate" class="buttonPas addgroup" classAct="button addgroup" content=" " /><roundcube:button type="link" command="delegate-elete" title="kolab_delegation.deletedelegate" class="buttonPas delete" classAct="button delete" content=" " />
-	</div>
-</div>
-
-<script type="text/javascript">
-	var viewsplit = new rcube_splitter({ id:'delegatelistsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 300 });
-	rcmail.add_onload('viewsplit.init()');
-</script>
-
-<div id="prefs-box">
-	<roundcube:frame contentframe="delegation-frame" id="delegation-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
-</div>
-
-</div>
-
-<div id="delegate-delete-dialog">
-	<p><roundcube:label name="kolab_delegation.delegatedeleteconfirm" /></p>
-	<span><input type="checkbox" value="1" checked="checked" /><roundcube:label name="kolab_delegation.delegateremoveacl" /></span>
-</div>
-
-</body>
-</html>
diff --git a/plugins/kolab_delegation/skins/classic/write.png b/plugins/kolab_delegation/skins/classic/write.png
deleted file mode 100644
index ad71fa95..00000000
Binary files a/plugins/kolab_delegation/skins/classic/write.png and /dev/null differ
diff --git a/plugins/kolab_delegation/skins/elastic/templates/editform.html b/plugins/kolab_delegation/skins/elastic/templates/editform.html
new file mode 100644
index 00000000..d75ee69d
--- /dev/null
+++ b/plugins/kolab_delegation/skins/elastic/templates/editform.html
@@ -0,0 +1,23 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_delegation.delegate" /></h1>
+
+<div class="formcontent">
+	<form action="#" method="post" id="delegateform" class="propform">
+		<fieldset>
+			<legend><roundcube:label name="kolab_delegation.delegateprops" /></legend>
+			<roundcube:object name="plugin.delegateform" form="delegateform" class="propform" />
+		</fieldset>
+		<fieldset>
+			<legend><roundcube:label name="kolab_delegation.delegatefolders" /></legend>
+			<roundcube:object name="plugin.delegatefolders" form="delegateform"
+				id="delegatefolders" use-fieldsets="true" class="tabbed" />
+		</fieldset>
+	</form>
+</div>
+
+<div class="formbuttons">
+	<roundcube:button command="delegate-save" class="btn btn-primary submit" label="save" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_delegation/skins/elastic/templates/settings.html b/plugins/kolab_delegation/skins/elastic/templates/settings.html
new file mode 100644
index 00000000..a32b300c
--- /dev/null
+++ b/plugins/kolab_delegation/skins/elastic/templates/settings.html
@@ -0,0 +1,50 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_delegation.tabtitle" /></h1>
+
+<!-- devices list -->
+<div class="list listbox selected" aria-labelledby="aria-label-delegateslist">
+	<div class="header">
+		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
+		<span id="aria-label-delegateslist" class="header-title"><roundcube:label name="kolab_delegation.delegates" /></span>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="plugin.delegatelist" id="delegate-table" class="listing" role="listbox"
+			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="delegate-add" />
+	</div>
+<!--
+	<div class="footer"></div>
+-->
+</div>
+
+<!-- delegatee info frame -->
+<div class="content" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div class="toolbar">
+			<roundcube:button command="delegate-add" type="link"
+				label="create" title="kolab_delegation.adddelegate"
+				class="button create disabled" classAct="button create" innerClass="inner" />
+			<roundcube:button command="delegate-delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_delegation.deletedelegate" innerclass="inner" />
+		</div>
+	</div>
+	<div class="iframe-wrapper">
+		<roundcube:frame contentframe="delegation-frame" id="delegation-frame" src="/watermark.html" title="arialabeldelegateform" />
+	</div>
+</div>
+
+<div id="delegate-delete-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-delegatedeletedialog" aria-hidden="true">
+	<h3 id="aria-label-delegatedeletedialog" class="voice"><roundcube:label name="kolab_delegation.arialabeldelegatedelete" /></h3>
+	<p><roundcube:label name="kolab_delegation.delegatedeleteconfirm" /></p>
+	<span><input type="checkbox" value="1" checked="checked" /><roundcube:label name="kolab_delegation.delegateremoveacl" /></span>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_files/composer.json b/plugins/kolab_files/composer.json
index f708e154..9070086c 100644
--- a/plugins/kolab_files/composer.json
+++ b/plugins/kolab_files/composer.json
@@ -4,7 +4,7 @@
     "description": "User interface for Kolab File Manager (Chwala)",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -21,6 +21,6 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_files/config.inc.php.dist b/plugins/kolab_files/config.inc.php.dist
index 3403842d..f57cb526 100644
--- a/plugins/kolab_files/config.inc.php.dist
+++ b/plugins/kolab_files/config.inc.php.dist
@@ -3,6 +3,12 @@
 // URL of kolab-chwala installation
 $config['kolab_files_url'] = '/chwala/';
 
+// Optional URL of kolab-chwala installation for connections
+// made by the Roundcube host. Useful when the chwala host name does not
+// resolve on the server to the same IP as on the client.
+// By default kolab_files_url will be used.
+$config['kolab_files_server_url'] = '';
+
 // List of files list columns. Available are: name, size, mtime, type
 $config['kolab_files_list_cols'] = array('name', 'mtime', 'size');
 
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 39b931a8..3a60ddb1 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -42,7 +42,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
         var link = $('<a href="#" class="button filesaveall">')
           .text(rcmail.gettext('kolab_files.saveall'))
           .click(function() { kolab_directory_selector_dialog(); })
-          .insertAfter(attachment_list);
+          .insertAfter($('.header-content > .header-links').length ? $('.header-links > a:last') : attachment_list);
       }
 
       rcmail.addEventListener('menu-open', kolab_files_attach_menu_open);
@@ -56,7 +56,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
     if (!rcmail.env.action || rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
       // add "attach from cloud" button for event/task dialog in mail
       rcmail.addEventListener('plugin.mail2event_dialog', function() {
-        if (!$('#calendar-attachment-form input.fromcloud').length)
+        if (!$('#calendar-attachment-form a.fromcloud').length)
           kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
       });
     }
@@ -64,12 +64,12 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
   else if (rcmail.task == 'calendar') {
     // add "attach from cloud" button for event dialog
     if (!rcmail.env.action)
-      kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
+      kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons, #edit-attachments-form'));
   }
   else if (rcmail.task == 'tasks') {
     // add "attach from cloud" button for task dialog
     if (!rcmail.env.action)
-      kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons'));
+      kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons, #taskedit-attachments-form'));
   }
   else if (rcmail.task == 'files') {
     if (rcmail.gui_objects.fileslist) {
@@ -87,8 +87,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
         .addEventListener('dragstart', function(e) { kolab_files_drag_start(e); })
         .addEventListener('dragmove', function(e) { kolab_files_drag_move(e); })
         .addEventListener('dragend', function(e) { kolab_files_drag_end(e); })
-        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); })
-        .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); });
 
       rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
 
@@ -107,8 +106,7 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
       rcmail.sessionslist.addEventListener('dblclick', function(o) { kolab_files_sessions_list_dblclick(o); })
         .addEventListener('select', function(o) { kolab_files_sessions_list_select(o); })
         .addEventListener('keypress', function(o) { kolab_files_sessions_list_keypress(o); })
-        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'sessions'); })
-        .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'sessions'); });
 
       rcmail.sessionslist.init();
       kolab_files_list_coltypes('sessions');
@@ -142,7 +140,7 @@ function kolab_files_init()
   if (window.file_api)
     return;
 
-  var manticore_config = {};
+  var editor_config = {};
 
   // Initialize application object (don't change var name!)
   file_api = $.extend(new files_api(), new kolab_files_ui());
@@ -153,7 +151,7 @@ function kolab_files_init()
     sort_col: 'name',
     sort_reverse: false,
     search_threads: rcmail.env.search_threads,
-    resources_dir: rcmail.assets_path('program/resources'),
+    resources_dir: rcmail.env.files_url.replace(/\/api\/?$/, '/resources'),
     caps: rcmail.env.files_caps,
     supported_mimetypes: rcmail.env.file_mimetypes
   });
@@ -161,22 +159,29 @@ function kolab_files_init()
   file_api.translations = rcmail.labels;
 
   if (rcmail.task == 'files') {
-    if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore) {
-      manticore_config = {
+    if (rcmail.env.action == 'edit' && rcmail.env.editor_type) {
+      // Extract the domain here, it can't be done by Chwala
+      // when using WOPI, which does not set iframe src attribute
+      var domain, href = rcmail.env.file_data.viewer.href;
+      if (href && /^(https?:\/\/[^/]+)/i.test(href))
+        domain = RegExp.$1;
+
+      editor_config = {
         // UI elements
         iframe: $('#fileframe').get(0),
+        domain: domain,
         export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
         title_input: $('#document-title').get(0),
         members_list: $('#members').get(0),
         photo_url: '?_task=addressbook&_action=photo&_error=1&_email=%email',
         photo_default_url: rcmail.env.photo_placeholder,
         // events
-        ready: function(data) { manticore_init(); },
-        sessionClosed: function(data) { return manticore_close(); }
+        ready: function(data) { document_editor_init(); },
+        sessionClosed: function(data) { return document_editor_close(); }
       };
 
       if (rcmail.env.file_data.writable)
-        manticore_config.documentChanged = function(data) { rcmail.enable_command('document-save', true); };
+        editor_config.documentChanged = function(data) { rcmail.enable_command('document-save', true); };
     }
     else if (rcmail.env.action == 'open') {
       // initialize folders list (for dialogs)
@@ -185,23 +190,60 @@ function kolab_files_init()
       // get ongoing sessions
       file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
     }
+    else if (rcmail.env.action == 'share') {
+      kolab_files_share_form_init();
+    }
     else {
+      file_api.env.init_folder = rcmail.env.folder;
+      file_api.env.init_collection = rcmail.env.collection;
       file_api.folder_list();
       file_api.browser_capabilities_check();
+
+      if (rcmail.env.contextmenu) {
+        rcmail.env.folders_cm = rcmail.contextmenu.init({menu_name: 'foldercontextmenu', menu_source: '#folderoptions > ul', list_object: 'folder_list'}, {
+          addmenuitem: function(p) {
+            // don't add Mount option to the menu
+            var str = $(p.el).children('a').first().attr('onclick');
+            if (str && str.match(/folder-mount/))
+              return {result: false, abort: true};
+          },
+          activate: function(p) {
+            var folder = rcmail.env.context_menu_source_id;
+            switch (p.command) {
+              case 'files-folder-delete':
+              case 'folder-rename':
+                return !folder.match(/^folder-collection-(.*)$/);
+              case 'folder-share':
+                return !folder.match(/^folder-collection-(.*)$/) && file_api.is_shareable(folder);
+              case 'folder-create':
+              case 'folder-mount':
+                return true;
+            }
+          },
+          beforecommand: function(e) {
+            rcmail.env.file_api_context = [file_api.env.folder, file_api.env.collection];
+            file_api.env.folder = rcmail.env.context_menu_source_id;
+          },
+          aftercommand: function(e) {
+            file_api.env.folder = rcmail.env.file_api_context[0];
+            file_api.env.collection = rcmail.env.file_api_context[1];
+          }
+        });
+      }
     }
   }
 
-  if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && !rcmail.env.framed)
-    $.extend(manticore_config, {
+  if (rcmail.env.files_caps && !rcmail.env.framed && rcmail.env.files_caps.DOCEDIT)
+    $.extend(editor_config, {
       // invitation notifications
       api: file_api,
       owner: rcmail.env.files_user,
       interval: rcmail.env.files_interval || 60,
       invitationMore: true,
-      invitationChange: manticore_invitation_handler
+      invitationChange: document_editor_invitation_handler
     });
 
-  $.extend(manticore_config, {
+  $.extend(editor_config, {
     // notifications/alerts
     gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
     set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
@@ -213,7 +255,10 @@ function kolab_files_init()
     }
   });
 
-  manticore = new manticore_api(manticore_config);
+  if (window.document_editor_api)
+    document_editor = new document_editor_api(editor_config);
+  else
+    document_editor = new manticore_api(editor_config);
 };
 
 // returns API authorization token
@@ -221,14 +266,14 @@ function kolab_files_token()
 {
   // consider the token from parent window more reliable (fresher) than in framed window
   // it's because keep-alive is not requested in frames
-  return window.parent && parent.rcmail && parent.rcmail.env.files_token ? parent.rcmail.env.files_token : rcmail.env.files_token;
+  return rcmail.is_framed() && parent.rcmail.env.files_token ? parent.rcmail.env.files_token : rcmail.env.files_token;
 };
 
 function kolab_files_from_cloud_widget(elem)
 {
-  var input = $('<input class="button fromcloud" type="button">')
-      .attr('tabindex', $('input', elem).attr('tabindex') || 0)
-      .val(rcmail.gettext('kolab_files.fromcloud'))
+  $('<a class="button btn btn-secondary fromcloud">')
+      .attr('tabindex', $('button,input', elem).first().attr('tabindex') || 0)
+      .text(rcmail.gettext('kolab_files.fromcloud'))
       .click(function() { kolab_files_selector_dialog(); })
       .appendTo(elem);
 
@@ -239,8 +284,7 @@ function kolab_files_from_cloud_widget(elem)
       column_movable: false,
       dblclick_time: rcmail.dblclick_time
     });
-    rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); })
-      .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+    rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); });
 
     rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true);
 
@@ -327,13 +371,22 @@ function kolab_directory_selector_dialog(id)
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.' + label),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
+    classes: {'ui-dialog': 'selection-dialog files-dialog'},
     minWidth: 250,
     minHeight: 300,
     height: 400,
     width: 300
   }, fn);
 
+  // add link for "more options" drop-down
+  if (!dialog.find('foldercreatelink').length)
+    $('<a>')
+      .attr({href: '#', 'class': 'btn btn-link options add-folder'})
+      .text(rcmail.gettext('kolab_files.addfolder'))
+      .click(function(e) { rcmail.command('folder-create', '', this, e); })
+      .prependTo(dialog.parent().parent().find('.ui-dialog-buttonset'));
+
   // "enable" folder creation when dialog is displayed in parent window
   if (rcmail.is_framed()) {
     parent.rcmail.enable_command('folder-create', true);
@@ -350,7 +403,7 @@ function kolab_files_selector_dialog()
 
   buttons[rcmail.gettext('kolab_files.attachsel')] = function () {
     var list = [];
-    $('#fileslist tr.selected').each(function() {
+    $('#filelist tr.selected').each(function() {
       list.push($(this).data('file'));
     });
 
@@ -381,7 +434,8 @@ function kolab_files_selector_dialog()
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.selectfiles'),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
+    classes: {'ui-dialog': 'selection-dialog files-dialog'},
     minWidth: 500,
     minHeight: 300,
     width: 700,
@@ -442,14 +496,15 @@ function kolab_files_folder_create_dialog()
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.foldercreate'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction save', 'cancel'],
+    height: 200
   });
 
   // Fix submitting form with Enter
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  file_api.folder_select_element(select, {empty: true, writable: true});
+  file_api.folder_select_element(select, {empty: !rcmail.env.files_caps.NOROOT, writable: true});
 };
 
 // folder edit dialog
@@ -458,7 +513,8 @@ function kolab_files_folder_edit_dialog()
   var dialog = $('#files-folder-edit-dialog'),
     buttons = {},
     separator = file_api.env.directory_separator,
-    arr = file_api.env.folder.split(separator),
+    current_folder = file_api.env.folder,
+    arr = current_folder.split(separator),
     folder = arr.pop(),
     path = arr.join(separator),
     select = $('select[name="parent"]', dialog).html(''),
@@ -475,7 +531,7 @@ function kolab_files_folder_edit_dialog()
 
     folder += name;
 
-    file_api.folder_rename(file_api.env.folder, folder);
+    file_api.folder_rename(current_folder, folder);
     kolab_dialog_close(this);
   };
 
@@ -487,14 +543,27 @@ function kolab_files_folder_edit_dialog()
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.folderedit'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction save', 'cancel'],
+    height: 200
   });
 
   // Fix submitting form with Enter
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  file_api.folder_select_element(select, {selected: path, empty: true});
+  file_api.folder_select_element(select, {selected: path, empty: !rcmail.env.files_caps.NOROOT});
+};
+
+// folder sharing dialog
+function kolab_files_folder_share_dialog()
+{
+  var dialog = $('<iframe>').attr('src', rcmail.url('share', {_folder: file_api.env.folder, _framed: 1}));
+
+  rcmail.simple_dialog(dialog, rcmail.gettext('kolab_files.foldershare'), null, {
+    cancel_button: 'close',
+    width: 600,
+    height: 500
+  });
 };
 
 // folder mounting dialog
@@ -532,24 +601,29 @@ function kolab_files_folder_mount_dialog()
     kolab_dialog_close(this);
   };
 
-  // close folderoption menu
-  rcmail.hide_menu('folderoptions');
-
   // initialize drivers list
   if (!rcmail.drivers_list_initialized) {
     rcmail.drivers_list_initialized = true;
 
     $('td.source', dialog).each(function() {
-      $(this).click(function() {
+      var td = $(this),
+        id = td.attr('id').replace('source-', ''),
+        meta = rcmail.env.external_sources[id];
+
+      $.each(meta.form_values || [], function(i, v) {
+        td.find('#source-' + id + '-' + i).val(v);
+      });
+
+      td.click(function() {
         $('td.selected', dialog).removeClass('selected');
         dialog.find('.driverform').hide();
         $(this).addClass('selected').find('.driverform').show();
         $('input[type="radio"]', this).prop('checked', true);
-     });
-   });
+      });
+    });
   }
 
-  args.button_classes = ['mainaction'];
+  args.button_classes = ['mainaction save', 'cancel'];
 
   // show dialog window
   kolab_dialog_show(dialog, args, function() {
@@ -577,7 +651,7 @@ function kolab_files_file_edit_dialog(file, sessions, readonly)
         kolab_dialog_close(dlg);
 
       if (id && input.parent().is('.session.request')) {
-        manticore.invitation_request({session_id: id});
+        document_editor.invitation_request({session_id: id});
         return;
       }
 
@@ -644,7 +718,7 @@ function kolab_files_file_edit_dialog(file, sessions, readonly)
   kolab_dialog_show(dialog, {
     title: title,
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
     minHeight: height - 100,
     height: height
   });
@@ -681,9 +755,9 @@ function kolab_files_file_rename_dialog(file)
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.renamefile'),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
     minHeight: 100,
-    height: 200
+    height: 100
   });
 };
 
@@ -691,6 +765,7 @@ function kolab_files_file_rename_dialog(file)
 function kolab_files_file_create_dialog(file)
 {
   var buttons = {}, action = file ? 'copy' : 'create',
+    button_classes = ['mainaction save edit'],
     dialog = $('#files-file-create-dialog'),
     type_select = $('select[name="type"]', dialog),
     select = $('select[name="parent"]', dialog).html(''),
@@ -726,6 +801,7 @@ function kolab_files_file_create_dialog(file)
   };
 
   if (action == 'create') {
+    button_classes.push('save');
     buttons[rcmail.gettext('kolab_files.create')] = function() {
       create_func(this);
     };
@@ -736,6 +812,7 @@ function kolab_files_file_create_dialog(file)
     type_select.parent('tr').hide();
   }
 
+  button_classes.push('cancel');
   buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
@@ -747,7 +824,7 @@ function kolab_files_file_create_dialog(file)
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.' + action + 'file'),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: button_classes,
     minHeight: 150,
     height: 250
   });
@@ -759,13 +836,12 @@ function kolab_files_file_create_dialog(file)
 // file session dialog
 function kolab_files_session_dialog(session)
 {
-  var buttons = {},
+  var buttons = {}, button_classes = [],
     dialog = $('#files-session-dialog'),
     filename = file_api.file_name(session.file),
     owner = session.owner_name || session.owner,
     title = rcmail.gettext('kolab_files.sessiondialog'),
     content = rcmail.gettext('kolab_files.sessiondialogcontent'),
-    button_classes = ['mainaction'],
     join_session = function(id) {
       var viewer = file_api.file_type_supported('application/vnd.oasis.opendocument.text', rcmail.env.files_caps);
         params = {action: 'edit', session: id};
@@ -785,9 +861,10 @@ function kolab_files_session_dialog(session)
       kolab_dialog_close(this);
       file_api.document_delete(session.id);
     };
-    button_classes.push('delete');
+    button_classes = ['mainaction edit', 'delete'];
   }
   else if (session.is_invited) {
+    button_classes = ['mainaction edit'];
     // @TODO: check if not-accepted and provide "Decline invitation" button
     // @TODO: Add "Accept button", add comment field to the dialog
     buttons[rcmail.gettext('kolab_files.join')] = function() {
@@ -796,13 +873,15 @@ function kolab_files_session_dialog(session)
     };
   }
   else {
+    button_classes = ['mainaction session request'];
     buttons[rcmail.gettext('kolab_files.request')] = function() {
       kolab_dialog_close(this);
       // @TODO: Add comment field to the dialog
-      manticore.invitation_request({session_id: session.id});
+      document_editor.invitation_request({session_id: session.id});
     };
   }
 
+  button_classes.push('cancel');
   buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
@@ -870,9 +949,9 @@ function kolab_dialog_submit_handler()
 };
 
 // Hides dialog
-function kolab_dialog_close(dialog)
+function kolab_dialog_close(dialog, destroy)
 {
-  (rcmail.is_framed() ? window.parent : window).$(dialog).dialog('close');
+  (rcmail.is_framed() ? window.parent : window).$(dialog).dialog(destroy ? 'destroy' : 'close');
 };
 
 // smart upload button
@@ -1119,11 +1198,13 @@ function kolab_files_drag_end(e)
 
       if (menu && modkey == SHIFT_KEY && rcmail.commands['files-copy']) {
         var pos = rcube_event.get_mouse_pos(e);
-        $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
+        rcmail.show_menu(menu.id, true, e);
+        $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'});
         return;
       }
 
       rcmail.command('files-move', rcmail.env.drag_target);
+      rcmail.env.drag_target = null;
     }
   }
 };
@@ -1166,18 +1247,25 @@ function kolab_files_frame_load(frame)
     info = rcmail.env.file_data;
 
   try {
-    rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
+    rcmail.file_editor = win.file_editor;
   }
   catch (e) {};
 
   // on edit page switch immediately to edit mode
-  if (rcmail.file_editor && rcmail.env.action == 'edit')
+  if (rcmail.file_editor && rcmail.file_editor.editable && rcmail.env.action == 'edit')
     rcmail.files_edit();
 
-  rcmail.enable_command('files-edit', rcmail.file_editor
-    || (info && info.viewer && info.viewer.manticore));
+  rcmail.enable_command('files-edit', (rcmail.file_editor && rcmail.file_editor.editable)
+    || rcmail.env.editor_type
+    || (file_api.file_type_supported(rcmail.env.file_data.type, rcmail.env.files_caps) & 4));
+
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
     || (info && /^image\//i.test(info.type)));
+
+  // Enable image tools
+  rcmail.enable_command('image-scale', 'image-rotate', info && !!/^image\//.test(info.type));
+  rcmail.gui_objects.messagepartframe = frame;
+
   // detect Print button and check if it can be accessed
   try {
     if ($('#fileframe').contents().find('#print').length)
@@ -1269,51 +1357,119 @@ function kolab_files_progress_str(param)
     .replace(/\$total/, total);
 };
 
+function kolab_files_share_form_init()
+{
+  $('fieldset > table', rcmail.gui_objects.shareform).each(function() {
+    var cnt = 0,
+      mode = $(this).data('mode'),
+      single = $(this).data('single');
+
+    $('tbody > tr', this).each(function(i, row) {
+      if (!i) {
+        $('button.submit', row).on('click', function() { file_api.sharing_submit(rcmail.env.folder, row, mode); });
+        $('input[data-autocomplete]').each(function() {
+          var input = $(this), req_name = 'filesac-' + mode;
+          kolab_files_autocomplete(input, req_name, function(e) {
+            $(row).find('input[type=hidden]').each(function() {
+              $(this).val(e.data[this.name] || '');
+            });
+          });
+        });
+      }
+      else {
+        cnt++;
+        $('button.delete', row).on('click', function() { file_api.sharing_delete(rcmail.env.folder, row, mode); });
+        $('select,input[type=text]', row).on('change', function() { file_api.sharing_update(rcmail.env.folder, row, mode); });
+      }
+    });
+
+    if (single && cnt) {
+      $('tbody > tr:first', this).find('button.submit, input, select').prop('disabled', true);
+    }
+  });
+};
+
+function kolab_files_autocomplete(input, action, insert_callback)
+{
+  rcmail.init_address_input_events(input, {action: action});
+
+  // "Redirect" autocomplete requests to Chwala API
+  if (rcmail.env.files_api_version > 3) {
+    rcmail.addEventListener('request' + action, function(post) {
+      var params = {search: post._search, mode: input.data('autocomplete') || 'user', folder: rcmail.env.folder},
+        callback = function(response) {
+          var result = response.result || [];
+          $.each(result, function() {
+            // add fake email to skip Roundcube's group expanding code
+            if (this.type == 'group' && !this.email)
+              this.email = 1;
+            });
+
+            rcmail.ksearch_query_results(result, post._search, post._reqid);
+        },
+        error_callback = function(o, status, err, data) {
+          file_api.http_error(o, status, err, data);
+          rcmail.ksearch_query_results([], post._search, post._reqid);
+        };
+
+      return file_api.get('autocomplete', params, callback, error_callback);
+    });
+  }
+
+  // Update hidden fields on selection
+  rcmail.addEventListener('autocomplete_insert', function(e) {
+    if (e.field == input[0]) {
+      input.val(e.insert.replace(/[, ]+$/, ''));
+    }
+    if (insert_callback)
+      insert_callback(e);
+  });
+};
+
 
 /**********************************************************/
-/*********    Manticore editor functionality     **********/
+/*********     document editor functionality     **********/
 /**********************************************************/
 
 // Initialize document toolbar functionality
-function manticore_init()
+function document_editor_init()
 {
   var info = rcmail.env.file_data;
 
-  rcmail.enable_command('document-export', true);
+  rcmail.enable_command('document-export', 'document-print', true);
 
   if (info && info.session && info.session.is_owner)
     rcmail.enable_command('document-close', 'document-editors', true);
 };
 
 // executed on editing session termination
-function manticore_close()
+function document_editor_close()
 {
-  $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
-    .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')))
-    .dialog({
-      resizable: false,
-      closeOnEscape: true,
-      dialogClass: 'popupmessage error',
-      title: rcmail.gettext('kolab_files.sessionterminatedtitle'),
-      close: function() { window.close(); },
-      position: ['center', 'center'],
-      width: 420,
-      minHeight: 90
-    }).show();
+  var dialog = $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
+    .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')));
+
+  rcmail.alert_dialog(dialog, function() { window.close(); }, {
+      title: rcmail.gettext('kolab_files.sessionterminatedtitle')
+  });
 
   return false; // skip Chwala's error message
 };
 
 rcube_webmail.prototype.document_save = function()
 {
-  manticore.save(function(data) {
+  document_editor.save(function(data) {
     rcmail.enable_command('document-save', false);
   });
 };
 
 rcube_webmail.prototype.document_export = function(type)
 {
-  manticore.export(type || 'odt');
+  document_editor.export(type || 'odt');
+};
+
+rcube_webmail.prototype.document_print = function()
+{
+  document_editor.print();
 };
 
 rcube_webmail.prototype.document_editors = function()
@@ -1325,10 +1481,10 @@ rcube_webmail.prototype.document_editors = function()
 rcube_webmail.prototype.document_close = function()
 {
   // check document "unsaved changes" state and display a warning
-  if (this.commands['document-save'] && !confirm(this.gettext('kolab_files.unsavedchanges')))
-    return;
-
-  file_api.document_delete(this.env.file_data.session.id);
+  if (this.commands['document-save'])
+    this.confirm_dialog(this.gettext('kolab_files.unsavedchanges'), 'kolab_files.terminate', function() {
+      file_api.document_delete(rcmail.env.file_data.session.id);
+    }, {button_class: 'delete'});
 };
 
 // document editors management dialog
@@ -1361,14 +1517,13 @@ function kolab_files_editors_dialog(session)
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.manageeditors'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['cancel']
   });
 
   if (!rcmail.env.editors_dialog) {
     rcmail.env.editors_dialog = dialog;
-    rcmail.init_address_input_events($('#invitation-editor-name'), {action: 'files/autocomplete'});
 
-    rcmail.addEventListener('autocomplete_insert', function(e) {
+    kolab_files_autocomplete($('#invitation-editor-name'), 'files/autocomplete', function(e) {
       var success = false;
       if (e.field.name == 'participant') {
         // e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL'
@@ -1420,7 +1575,7 @@ function kolab_files_add_attendees(names, comment)
       counter++;
     }
     else {
-      alert(rcmail.gettext('noemailwarning'));
+      rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
     }
   }
 
@@ -1459,7 +1614,7 @@ function kolab_files_attendee_record(user, status, username)
     select = $('<select>').change(function() {
         var val = $(this).val(), map = {accepted: 'invitation_accept', declined: 'invitation_decline'};
         if (map[val])
-          manticore[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
+          document_editor[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
       });
 
     if (type == 'requested')
@@ -1488,7 +1643,7 @@ function kolab_files_attendee_record(user, status, username)
       .append(name).append(state).append(buttons);
 };
 
-function manticore_invitation_handler(invitation)
+function document_editor_invitation_handler(invitation)
 {
   // make the "More" link clickable
   $('#' + invitation.id).parent('div').click(function() { kolab_files_invitation_dialog(invitation); });
@@ -1496,7 +1651,7 @@ function manticore_invitation_handler(invitation)
 
 function kolab_files_invitation_dialog(invitation)
 {
-  var text, records = [], content = [], buttons = {},
+  var text, records = [], content = [], buttons = {}, button_classes = [],
     dialog = $('#document-invitation-dialog'),
     data_map = {status: 'status', 'changed': 'when', filename: 'file', comment: 'comment'},
     record_fn = function(type, label, value) {
@@ -1519,28 +1674,30 @@ function kolab_files_invitation_dialog(invitation)
 
   if (!invitation.is_session_owner) {
     if (invitation.status == 'invited') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
+      button_classes = ['session join', 'session accept', 'session decline delete'];
 
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
         kolab_dialog_close(this);
       };
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
-        manticore.invitation_accept(invitation);
+        document_editor.invitation_accept(invitation);
         kolab_dialog_close(this);
       };
       buttons[rcmail.gettext('kolab_files.decline')] = function() {
-        manticore.invitation_decline(invitation);
+        document_editor.invitation_decline(invitation);
         kolab_dialog_close(this);
       };
     }
     else if (invitation.status == 'declined-owner') {
       // @todo: add option to request for an invitation again?
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
     }
     else if (invitation.status == 'accepted-owner') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
 
+      button_classes = ['mainaction session join'];
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
         kolab_dialog_close(this);
@@ -1549,21 +1706,22 @@ function kolab_files_invitation_dialog(invitation)
   }
   else {
     if (invitation.status == 'accepted') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
     }
     else if (invitation.status == 'declined') {
       // @todo: add option to invite the user again?
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
     }
     else if (invitation.status == 'requested') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
 
+      button_classes = ['session accept', 'session decline delete'];
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
-        manticore.invitation_accept(invitation);
+        document_editor.invitation_accept(invitation);
         kolab_dialog_close(this);
       };
       buttons[rcmail.gettext('kolab_files.decline')] = function() {
-        manticore.invitation_decline(invitation);
+        document_editor.invitation_decline(invitation);
         kolab_dialog_close(this);
       };
     }
@@ -1584,6 +1742,7 @@ function kolab_files_invitation_dialog(invitation)
     content.push($('<table class="propform">').html(records));
   }
 
+  button_classes.push('cancel');
   buttons[rcmail.gettext('kolab_files.close')] = function() {
     kolab_dialog_close(this);
   };
@@ -1593,7 +1752,8 @@ function kolab_files_invitation_dialog(invitation)
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.invitationtitle').replace('$file', invitation.filename),
-    buttons: buttons
+    buttons: buttons,
+    button_classes: button_classes
   });
 };
 
@@ -1649,33 +1809,74 @@ rcube_webmail.prototype.files_search_reset = function()
   file_api.file_search_reset();
 };
 
-rcube_webmail.prototype.files_folder_delete = function()
+rcube_webmail.prototype.files_folder_delete = function(prop, elem, event)
 {
-  if (confirm(this.get_label('kolab_files.folderdeleteconfirm')))
+  this.hide_menu('folderoptions', event);
+  this.confirm_dialog(this.get_label('kolab_files.folderdeleteconfirm'), 'delete', function() {
     file_api.folder_delete(file_api.env.folder);
+  });
 };
 
 rcube_webmail.prototype.files_delete = function()
 {
-  if (!confirm(this.get_label('kolab_files.filedeleteconfirm')))
-    return;
-
-  var files = this.env.file ? [this.env.file] : kolab_files_selected();
-  file_api.file_delete(files);
+  this.confirm_dialog(this.get_label('kolab_files.filedeleteconfirm'), 'delete', function() {
+    var files = rcmail.env.file ? [rcmail.env.file] : kolab_files_selected();
+    file_api.file_delete(files);
+  });
 };
 
-rcube_webmail.prototype.files_move = function(folder)
+rcube_webmail.prototype.files_move = function(folder, obj, event, files)
 {
-  var files = kolab_files_selected();
+  if (!files)
+    files = kolab_files_selected();
+
+  if (!folder) {
+    var ref = this;
+    return this.files_folder_selector(event, function(folder) {
+      ref.files_move(folder, null, event, files);
+    });
+  }
+
   file_api.file_move(files, folder);
 };
 
-rcube_webmail.prototype.files_copy = function(folder)
+rcube_webmail.prototype.files_copy = function(folder, obj, event, files)
 {
-  var files = kolab_files_selected();
+  if (!files)
+    files = kolab_files_selected();
+
+  if (!folder) {
+    var ref = this;
+    return this.files_folder_selector(event, function(folder) {
+      ref.files_copy(folder, null, event, files);
+    });
+  }
+
   file_api.file_copy(files, folder);
 };
 
+  // create folder selector popup
+rcube_webmail.prototype.files_folder_selector = function(event, callback)
+{
+  this.entity_selector('folder-selector', callback, file_api.env.folders, function(folder, a, folder_fullname) {
+    var n = folder.depth || 0,
+        id = folder.id,
+        row = $('<li>');
+
+      if (folder.virtual || folder.readonly)
+        a.addClass('virtual').attr({'aria-disabled': 'true', tabindex: '-1'});
+      else
+        a.addClass('active').data('id', folder_fullname);
+
+      a.css('padding-left', n ? (n * 16) + 'px' : 0);
+
+      // add folder name element
+      a.append($('<span>').text(folder.name));
+
+      return row.append(a);
+    }, event);
+};
+
 rcube_webmail.prototype.files_upload = function(form)
 {
   if (form)
@@ -1686,7 +1887,7 @@ rcube_webmail.prototype.files_list = function(param)
 {
   // just rcmail wrapper, to handle command busy states
   file_api.file_list(param);
-}
+};
 
 rcube_webmail.prototype.files_list_update = function(head)
 {
@@ -1701,7 +1902,7 @@ rcube_webmail.prototype.sessions_list = function(param)
 {
   // just rcmail wrapper, to handle command busy states
   file_api.session_list(param);
-}
+};
 
 rcube_webmail.prototype.sessions_list_update = function(head)
 {
@@ -1756,7 +1957,7 @@ rcube_webmail.prototype.files_edit = function(session)
   else if (session !== true)
     params.session = session;
 
-  if (this.file_editor && !session) {
+  if (this.file_editor && this.file_editor.editable && !session) {
     this.file_editor.enable();
     this.enable_command('files-save', true);
   }
@@ -1853,13 +2054,21 @@ rcube_webmail.prototype.folder_create = function()
   kolab_files_folder_create_dialog();
 };
 
-rcube_webmail.prototype.folder_rename = function()
+rcube_webmail.prototype.folder_rename = function(prop, elem, event)
 {
+  this.hide_menu('folderoptions', event);
   kolab_files_folder_edit_dialog();
 };
 
-rcube_webmail.prototype.folder_mount = function()
+rcube_webmail.prototype.folder_share = function(prop, elem, event)
 {
+  this.hide_menu('folderoptions', event);
+  kolab_files_folder_share_dialog();
+};
+
+rcube_webmail.prototype.folder_mount = function(prop, elem, event)
+{
+  this.hide_menu('folderoptions', event);
   kolab_files_folder_mount_dialog();
 };
 
@@ -1934,6 +2143,24 @@ function kolab_files_ui()
     return true;
   };
 
+  // Check if specified folder (hierarchy) supports sharing
+  this.is_shareable = function(folder)
+  {
+    if (!folder)
+      folder = this.env.folder;
+
+    if (!folder)
+      return false;
+
+    var root = folder.split(this.env.directory_separator)[0],
+      caps = this.env.caps;
+
+    if (this.env.caps.MOUNTPOINTS && this.env.caps.MOUNTPOINTS[root])
+      caps = root != folder ? this.env.caps.MOUNTPOINTS[root] : {};
+
+    return !!caps.ACL;
+  };
+
   // folders list request
   this.folder_list = function(params)
   {
@@ -1954,7 +2181,7 @@ function kolab_files_ui()
     if (!this.response(response))
       return;
 
-    var first, body, rows = [],
+    var folder, first, body, rows = [],
       list_selector = rcmail.env.folder_list_selector || '#files-folder-list',
       search_selector = rcmail.env.folder_search_selector || '#foldersearch',
       elem = $(list_selector),
@@ -1963,8 +2190,8 @@ function kolab_files_ui()
       collections = ['audio', 'video', 'image', 'document'];
 
     // try parent window if the list element does not exist
-    // i.e. called from dialog in parent window
-    if (!elem.length && window.parent && parent.rcmail) {
+    // i.e. called from a dialog in parent window
+    if (!elem.length && rcmail.is_framed() && (rcmail.env.task != 'files' || (rcmail.env.action != 'open' && rcmail.env.action != 'edit'))) {
       body = window.parent.document.body;
       elem = $(list_selector, body);
       searchbox = $(search_selector, body);
@@ -1973,10 +2200,15 @@ function kolab_files_ui()
     if (elem.data('no-collections') == true)
       collections = [];
 
-    elem.html('');
-
     this.env.folders = this.folder_list_parse(response.result && response.result.list ? response.result.list : response.result);
 
+    rcmail.enable_command('files-create', true);
+
+    if (!elem.length)
+      return;
+
+    elem.html('');
+
     $.each(this.env.folders, function(i, f) {
       var row;
       if (row = file_api.folder_list_row(i, f)) {
@@ -1997,7 +2229,7 @@ function kolab_files_ui()
     });
 
     // add Sessions entry
-    if (rcmail.task == 'files' && !rcmail.env.action && rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE) {
+    if (rcmail.task == 'files' && !rcmail.env.action && rcmail.env.files_caps && rcmail.env.files_caps.DOCEDIT) {
       rows.push($('<li class="mailbox collection sessions"></li>')
         .attr('id', 'rcmli' + rcmail.html_identifier_encode('folder-collection-sessions'))
         .append($('<a class="name"></a>').text(rcmail.gettext('kolab_files.sessions')))
@@ -2009,6 +2241,13 @@ function kolab_files_ui()
         return file_api.folder_list_subscription_button_click(this);
       });
 
+    if (rcmail.env.contextmenu)
+      list.on('contextmenu', function(e) {
+        var elem = $(e.target).closest('li');
+          id = rcmail.html_identifier_decode(elem.attr('id').replace(/^rcmli/, ''));
+        rcmail.contextmenu.show_one(e, elem[0], id, rcmail.env.folders_cm);
+      });
+
     if (rcmail.folder_list) {
       rcmail.folder_list.reset();
       this.search_results_widget = null;
@@ -2041,35 +2280,54 @@ function kolab_files_ui()
         file_api.folder_select(node.id);
       });
 
-    // select first folder?
-    if (response.result.auth_errors) { }
+    // select first/current folder
+    if (response.result.auth_errors && response.result.auth_errors.length)
+      this.env.folder = this.env.collection = null;
     else if (this.env.folder)
       rcmail.folder_list.select(this.env.folder);
     else if (this.env.collection)
       rcmail.folder_list.select('folder-collection-' + this.env.collection);
+    else if (folder = this.env.init_folder) {
+      this.env.init_folder = null;
+      rcmail.folder_list.select(folder);
+    }
+    else if (folder = this.env.init_collection) {
+      this.env.init_collection = null;
+      rcmail.folder_list.select('folder-collection-' + folder);
+    }
     else if (first)
       rcmail.folder_list.select(first);
 
-    rcmail.enable_command('files-create', true);
-
     // add tree icons
 //    this.folder_list_tree(this.env.folders);
 
     // handle authentication errors on external sources
-    if (elem.length)
-      this.folder_list_auth_errors(response.result);
+    this.folder_list_auth_errors(response.result);
+
+    // Elastic: Set notree class on the folder list
+    var callback = function() {
+        list[list.find('.treetoggle').length > 0 ? 'removeClass' : 'addClass']('notree');
+    };
+    if (window.MutationObserver)
+      (new MutationObserver(callback)).observe(list.get(0), {childList: true, subtree: true});
+    callback();
   };
 
   this.folder_select = function(folder)
   {
-    if (rcmail.busy)
+    if (rcmail.busy || !folder)
       return;
 
+    rcmail.triggerEvent('files-folder-select', {folder: folder});
+
     var is_collection = folder.match(/^folder-collection-(.*)$/),
       collection = RegExp.$1 || null;
 
+    if (rcmail.task == 'files' && !rcmail.env.action)
+      rcmail.update_state(is_collection ? {collection: collection} : {folder: folder});
+
     if (collection == 'sessions') {
-      rcmail.enable_command('files-list', 'files-folder-delete', 'folder-rename', 'files-upload', false);
+      rcmail.enable_command('files-list', 'files-folder-delete', 'folder-rename', 'files-upload', 'files-open', 'files-edit', false);
       this.sessions_list();
       return;
     }
@@ -2087,6 +2345,7 @@ function kolab_files_ui()
     rcmail.enable_command('files-list', true);
     rcmail.enable_command('files-folder-delete', 'folder-rename', !is_collection);
     rcmail.enable_command('files-upload', !is_collection && this.is_writable());
+    rcmail.enable_command('folder-share', !is_collection && this.is_shareable());
     rcmail.command('files-list', is_collection ? {collection: collection} : {folder: folder});
 
     this.quota();
@@ -2127,23 +2386,20 @@ function kolab_files_ui()
   {
     var toggle, sublist, collapsed, parent, parent_name, classes = ['mailbox'],
       row = $('<li>'),
-      id = 'rcmli' + rcmail.html_identifier_encode(i);
-
-    row.attr('id', id).append($('<a class="name">').text(folder.name));
+      id = 'rcmli' + rcmail.html_identifier_encode(i),
+      content = $('<div>').append($('<a class="name">').text(folder.name));
 
     if (folder.virtual)
       classes.push('virtual');
     else {
       if (folder.subscribed !== undefined)
-        row.append(this.folder_list_subscription_button(folder.subscribed));
+        content.append(this.folder_list_subscription_button(folder.subscribed));
 
       if (folder.readonly)
         classes.push('readonly');
     }
 
-    row.addClass(classes.join(' '));
-
-    folder.ref = row;
+    folder.ref = row.attr({id: id, 'class': classes.join(' ')}).append(content);
 
     if (folder.depth) {
       // find parent folder
@@ -2177,7 +2433,7 @@ function kolab_files_ui()
   {
     return $('<a>').attr({
         title: rcmail.gettext('kolab_files.listpermanent'),
-        class: 'subscription' + (subscribed ? ' subscribed' : ''),
+        'class': 'subscription' + (subscribed ? ' subscribed' : ''),
         'aria-checked': subscribed,
         role: 'checkbox'
     });
@@ -2186,7 +2442,7 @@ function kolab_files_ui()
   // subscription button handler
   this.folder_list_subscription_button_click = function(elem)
   {
-    var folder = $(elem).parent('li').prop('id').replace(/^rcmli/, ''),
+    var folder = $(elem).parents('li:first').prop('id').replace(/^rcmli/, ''),
       selected = $(elem).hasClass('subscribed');
 
     folder = folder.replace(/--xsR$/, ''); // this might be a search result
@@ -2198,7 +2454,7 @@ function kolab_files_ui()
   // sets subscription button status
   this.folder_list_subscription_state = function(elem, status)
   {
-    $(elem).children('a.subscription')
+    $(elem).find('a.subscription:first')
       .prop('aria-checked', status)[status ? 'addClass' : 'removeClass']('subscribed');
   };
 
@@ -2324,7 +2580,7 @@ function kolab_files_ui()
           id: i,
           classes: classes,
           text: folder.name,
-          html: html,
+          html: $('<div>').append(html),
           collapsed: false,
           virtual: folder.virtual
         }, path.length ? path.join(separator) : null);
@@ -2387,7 +2643,7 @@ function kolab_files_ui()
           if (!folder.virtual)
             html.push(this.folder_list_subscription_button(true));
 
-          node.html = html;
+          node.html = $('<div>').append(html);
           delete node.children;
 
           rcmail.folder_list.insert(node, i > 0 ? path.slice(0, i).join(separator) : null);
@@ -2486,13 +2742,12 @@ function kolab_files_ui()
     if (folder == new_name)
       return;
 
-    this.env.folder_rename = new_name;
     this.req = this.set_busy(true, 'kolab_files.folderupdating');
     this.request('folder_move', {folder: folder, 'new': new_name}, 'folder_rename_response');
   };
 
   // folder create response handler
-  this.folder_rename_response = function(response)
+  this.folder_rename_response = function(response, data)
   {
     if (!this.response(response))
       return;
@@ -2500,7 +2755,9 @@ function kolab_files_ui()
     this.display_message('kolab_files.folderupdatenotice', 'confirmation');
 
     // refresh folders and files list
-    this.env.folder = this.env.folder_rename;
+    if (this.env.folder == data.folder)
+      this.env.folder = data['new'];
+
     this.folder_list();
   };
 
@@ -2531,24 +2788,153 @@ function kolab_files_ui()
   };
 
   // folder delete response handler
-  this.folder_delete_response = function(response)
+  this.folder_delete_response = function(response, data)
   {
     if (!this.response(response))
       return;
 
-    this.env.folder = null;
-    rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-list', false);
     this.display_message('kolab_files.folderdeletenotice', 'confirmation');
 
+    if (this.env.folder == data.folder) {
+      this.env.folder = null;
+      rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-list', false);
+    }
+
     // refresh folders list
     this.folder_list();
     this.quota();
   };
 
+  this.sharing_submit = function(folder, row, mode)
+  {
+    var post = this.sharing_data(row, {action: 'submit', folder: folder, mode: mode});
+
+    if (post === false)
+      return;
+
+    this.sharing_submit_post = post;
+    this.sharing_submit_row = row;
+    this.req = this.set_busy(true, 'kolab_files.updatingfolder' + mode);
+    this.post('sharing', post, 'sharing_submit_response');
+  };
+
+  this.sharing_submit_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    // reset inputs
+    $(this.sharing_submit_row).find('input[type=text]').val('');
+
+    var hidden = [],
+      post = $.extend({}, this.sharing_submit_post, response.result || {}),
+      form_info = rcmail.env.form_info[post.mode],
+      table = $(this.sharing_submit_row).closest('table'),
+      row = $('<tr>'),
+      btn = $('<button type="button" class="btn btn-secondary btn-danger delete">')
+        .text(rcmail.gettext('delete'))
+        .on('click', function() { file_api.sharing_delete(post.folder, $(this).closest('tr'), post.mode); });
+
+    if (form_info.list_column) {
+      row.append($('<td>').append($('<span class="name">').text(post[form_info.list_column])));
+    }
+    else {
+      $.each(form_info.form || [], function(i, v) {
+        var content, opts = [];
+
+        if (v.type == 'select') {
+          content = $('<select>').attr('name', i)
+            .on('change', function() { file_api.sharing_update(post.folder, $(this).closest('tr'), post.mode); });
+          $.each(v.options, function(i, v) {
+            opts.push($('<option>').attr('value', i).text(v));
+          });
+
+          content.append(opts).val(post[i]);
+        }
+        else {
+          content = $('<span class="name">').text(post[i]);
+          hidden.push($('<input>').attr({type: 'hidden', name: i, value: post[i] || ''}));
+        }
+
+        row.append($('<td>').append(content));
+      });
+    }
+
+    $.each(form_info.extra_fields || [], function(i, v) {
+      hidden.push($('<input>').attr({type: 'hidden', name: i, value: post[i] || ''}));
+    });
+
+    row.append($('<td>').append(btn).append(hidden));
+
+    $(this.sharing_submit_row).parent().append(row);
+
+    if (window.UI && UI.pretty_select)
+      row.find('select').each(function() { UI.pretty_select(this); }); // for Elastic
+
+    if (table.data('single')) {
+      $('tbody > tr:first', table).find('button,input,select').prop('disabled', true);
+    }
+
+    $('tbody > tr:first', table).find('input[type=text],input[type=password]').val('');
+  };
+
+  this.sharing_update = function(folder, row, mode)
+  {
+    var post = this.sharing_data(row, {action: 'update', folder: folder, mode: mode});
+
+    this.req = this.set_busy(true, 'kolab_files.updatingfolder' + mode);
+    this.post('sharing', post, 'sharing_update_response');
+  };
+
+  this.sharing_update_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    // todo: on error reset fields?
+  };
+
+  this.sharing_delete = function(folder, row, mode)
+  {
+    var post = this.sharing_data(row, {action: 'delete', folder: folder, mode: mode});
+
+    this.sharing_delete_row = row;
+    this.req = this.set_busy(true, 'kolab_files.updatingfolder' + mode);
+    this.post('sharing', post, 'sharing_delete_response');
+  };
+
+  this.sharing_delete_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    var table = $(this.sharing_delete_row).closest('table');
+
+    if (table.data('single')) {
+      $('tbody > tr:first', table).find('button,input,select').prop('disabled', false);
+    }
+
+    $(this.sharing_delete_row).remove();
+  };
+
+  this.sharing_data = function(row, data)
+  {
+    var error;
+
+    $('select,input', row).each(function() {
+      if (this.type == 'password' && !this.name.match(/confirm$/) && this.value != $('input[name=' + this.name + 'confirm]', row).val())
+        error = rcmail.display_message('kolab_files.passwordconflict', 'error');
+
+      data[this.name] = $(this).val();
+    });
+
+    return error ? false : data;
+  };
+
   // quota request
   this.quota = function()
   {
-    if (rcmail.env.files_quota)
+    if (rcmail.env.files_quota && (this.env.folder || !rcmail.env.files_caps.NOROOT))
       this.request('quota', {folder: this.env.folder}, 'quota_response');
   };
 
@@ -2666,6 +3052,7 @@ function kolab_files_ui()
     // empty the list
     this.env.file_list = [];
     rcmail.fileslist.clear(true);
+    rcmail.triggerEvent('listupdate', {list: rcmail.fileslist, rowcount: 0});
 
     // request
     if (params.collection || params.all_folders)
@@ -2697,6 +3084,7 @@ function kolab_files_ui()
 
     this.env.file_list = list;
     rcmail.fileslist.resize();
+    rcmail.triggerEvent('listupdate', {list: rcmail.fileslist, rowcount: rcmail.fileslist.rowcount});
 
     // update document sessions info of this folder
     if (list && list.length)
@@ -2822,7 +3210,7 @@ function kolab_files_ui()
   this.file_list_sort = function(col, reverse)
   {
     var n, len, list = this.env.file_list,
-      table = $('#fileslist'), tbody = $('<tbody>', table);
+      table = $('#filelist'), tbody = $('<tbody>', table);
 
     this.env.sort_col = col;
     this.env.sort_reverse = reverse;
@@ -2888,12 +3276,6 @@ function kolab_files_ui()
       if (c == 'name')
         col = '<td class="name filename ' + this.file_type_class(data.type) + '">'
           + '<span>' + escapeHTML(file_api.file_name(data.file)) + '</span></td>';
-/*
-      else if (c == 'mtime')
-        col = '<td class="mtime">' + data.mtime + '</td>';
-      else if (c == 'size')
-        col = '<td class="size">' + this.file_size(data.size) + '</td>';
-*/
       else if (c == 'owner')
         col = '<td class="owner">' + escapeHTML(data.owner_name || data.owner) + '</td>';
       else if (c == 'options')
@@ -2971,7 +3353,7 @@ function kolab_files_ui()
     });
 
     // refresh sessions info in time intervals
-    if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && (rcmail.fileslist || rcmail.env.file))
+    if (rcmail.env.files_caps && rcmail.env.files_caps.DOCEDIT && (rcmail.fileslist || rcmail.env.file))
       this.workers[folder] = setTimeout(function() {
         file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
       }, (rcmail.env.files_interval || 60) * 1000);
@@ -2985,7 +3367,7 @@ function kolab_files_ui()
     params.token = this.env.token;
     params.file = file;
 
-    rcmail.redirect(this.env.url + this.url('file_get', params));
+    rcmail.redirect(this.env.url + this.url('file_get', params), false);
   };
 
   // file(s) delete request
@@ -3012,16 +3394,22 @@ function kolab_files_ui()
       // check if opener window contains files list, if not we can just close current window
       if (rco && rco.fileslist && (opener.file_api.env.folder == dir || !opener.file_api.env.folder))
         self = opener.file_api;
-      else
-        window.close();
+      // also try parent for framed UI (Elastic)
+      else if (rcmail.is_framed() && parent.rcmail.fileslist && (parent.file_api.env.folder == dir || !parent.file_api.env.folder))
+        self = parent.file_api;
     }
 
     // @TODO: consider list modification "in-place" instead of full reload
     self.file_list();
     self.quota();
 
-    if (rcmail.env.file)
-      window.close();
+    if (rcmail.env.file) {
+      if (rcmail.is_framed()) {
+        parent.$('.ui-dialog:visible > .ui-dialog-buttonpane button.cancel').click();
+      }
+      else
+        window.close();
+    }
   };
 
   // file(s) move request
@@ -3105,8 +3493,8 @@ function kolab_files_ui()
   // or overwrite destination file(s)
   this.file_move_ask_user = function(list, move)
   {
-    var file = list[0], buttons = {},
-      text = rcmail.gettext('kolab_files.filemoveconfirm').replace('$file', file.dst)
+    var file = list[0], buttons = {}, button_classes = ['mainaction save file overwrite'],
+      text = rcmail.gettext('kolab_files.filemoveconfirm').replace('$file', file.dst),
       dialog = $('<div></div>');
 
     buttons[rcmail.gettext('kolab_files.fileoverwrite')] = function() {
@@ -3116,24 +3504,28 @@ function kolab_files_ui()
       f[file.src] = file.dst;
       file_api.file_move_ask_list = list;
       file_api.file_move_ask_mode = move;
-      dialog.dialog('destroy').remove();
+      kolab_dialog_close(this, true);
+
       file_api.req = file_api.set_busy(true, move ? 'kolab_files.filemoving' : 'kolab_files.filecopying');
       file_api.request(action, {file: f, overwrite: 1}, 'file_move_ask_user_response');
     };
 
-    if (list.length > 1)
+    if (list.length > 1) {
+      button_classes.push('save file overwrite all');
       buttons[rcmail.gettext('kolab_files.fileoverwriteall')] = function() {
         var f = {}, action = move ? 'file_move' : 'file_copy';
 
         $.each(list, function() { f[this.src] = this.dst; });
-        dialog.dialog('destroy').remove();
+        kolab_dialog_close(this, true);
+
         file_api.req = file_api.set_busy(true, move ? 'kolab_files.filemoving' : 'kolab_files.filecopying');
         file_api.request(action, {file: f, overwrite: 1}, action + '_response');
       };
+    }
 
     var skip_func = function() {
       list.shift();
-      dialog.dialog('destroy').remove();
+      kolab_dialog_close(this, true);
 
       if (list.length)
         file_api.file_move_ask_user(list, move);
@@ -3141,19 +3533,25 @@ function kolab_files_ui()
         file_api.file_list();
     };
 
+    button_classes.push('cancel file skip');
     buttons[rcmail.gettext('kolab_files.fileskip')] = skip_func;
 
-    if (list.length > 1)
+    if (list.length > 1) {
+      button_classes.push('cancel file skip all');
       buttons[rcmail.gettext('kolab_files.fileskipall')] = function() {
-      dialog.dialog('destroy').remove();
+      kolab_dialog_close(this, true);
         if (move)
           file_api.file_list();
       };
+    }
 
     // open jquery UI dialog
     kolab_dialog_show(dialog.html(text), {
+      title: rcmail.gettext('confirmationtitle'),
       close: skip_func,
       buttons: buttons,
+      button_classes: button_classes,
+      height: 50,
       minWidth: 400,
       width: 400
     });
@@ -3278,7 +3676,7 @@ function kolab_files_ui()
         size += files[i].size || files[i].fileSize;
 
       if (size > maxsize) {
-        alert(rcmail.get_label('kolab_files.uploadsizeerror').replace('$size', kolab_files_file_size(maxsize)));
+        rcmail.alert_dialog(rcmail.get_label('kolab_files.uploadsizeerror').replace('$size', kolab_files_file_size(maxsize)));
         return false;
       }
     }
@@ -3493,7 +3891,8 @@ function kolab_files_ui()
       _task: 'files',
       _action: params && params.action ? params.action : 'open',
       _file: file,
-      _viewer: viewer || 0
+      _viewer: viewer || 0,
+      _frame: 1
     };
 
     if (params && params.session)
@@ -3553,23 +3952,32 @@ function kolab_files_ui()
     if (!this.response(response))
       return;
 
-    if (rcmail.task == 'files' && rcmail.env.action == 'edit')
-      window.close();
+    if (rcmail.task == 'files' && rcmail.env.action == 'edit') {
+      if (document_editor && document_editor.terminate)
+        document_editor.terminate();
+      // use timeout to have a chance to properly propagate termination request
+      setTimeout(function() { window.close(); }, 500);
+    }
 
     // @todo: force sessions info update
 
     var win = window, list = rcmail.sessionslist;
 
     if (!list) {
-      win = window.opener;
+      win = window.opener || window.parent;
       if (win && win.rcmail && win.file_api)
         list = win.rcmail.sessionslist;
     }
 
     // remove session from the list (if sessions list exist)
-    if (list) {
-      list.remove(this.deleted_session);
+    if (list)
+      list.remove_row(this.deleted_session);
+    if (win && win.file_api && win.file_api.env.sessions_list)
       delete win.file_api.env.sessions_list[this.deleted_session];
+
+    // For Elastic: hide the parent dialog
+    if (rcmail.is_framed()) {
+      parent.$('.ui-dialog:visible button.cancel').click();
     }
   };
 
@@ -3640,6 +4048,16 @@ function kolab_files_ui()
       if (!this.auth_errors)
         this.auth_errors = {};
 
+      $.each(result.auth_errors || {}, function(i, v) {
+        // for normal errors we display only an error message, other will display a dialog
+        if (v.error) {
+          if (v.error == 580) {
+            rcmail.display_message(rcmail.gettext('kolab_files.storageautherror').replace('$title', i), 'error');
+          }
+          delete result.auth_errors[i];
+        }
+      });
+
       $.extend(this.auth_errors, result.auth_errors);
     }
 
@@ -3680,6 +4098,7 @@ function kolab_files_ui()
     };
 
     args.title = this.t('kolab_files.folderauthtitle').replace('$title', label);
+    args.button_classes = ['mainaction save', 'cancel'];
 
     // show dialog window
     kolab_dialog_show(dialog, args, function() {
@@ -3705,7 +4124,7 @@ function kolab_files_ui()
       parent = $('#' + id);
 
     // try parent window if the folder element does not exist
-    if (!parent.length && window.parent && window.parent.rcmail) {
+    if (!parent.length && rcmail.is_framed()) {
       parent = $('#' + id, window.parent.document.body);
     }
 
diff --git a/plugins/kolab_files/kolab_files.php b/plugins/kolab_files/kolab_files.php
index acbf9f8b..ccbcb4e8 100644
--- a/plugins/kolab_files/kolab_files.php
+++ b/plugins/kolab_files/kolab_files.php
@@ -50,6 +50,7 @@ class kolab_files extends rcube_plugin
         $this->register_action('prefs', array($this, 'actions'));
         $this->register_action('open',  array($this, 'actions'));
         $this->register_action('edit',  array($this, 'actions'));
+        $this->register_action('share',  array($this, 'actions'));
         $this->register_action('autocomplete', array($this, 'autocomplete'));
 
         // we use libkolab::http_request() from libkolab with its configuration
@@ -57,6 +58,8 @@ class kolab_files extends rcube_plugin
 
         // Load UI from startup hook
         $this->add_hook('startup', array($this, 'startup'));
+
+        $this->add_hook('preferences_save', array($this, 'preferences_save'));
     }
 
     /**
@@ -72,15 +75,16 @@ class kolab_files extends rcube_plugin
 
             $this->load_config();
 
-            $url = $this->rc->config->get('kolab_files_url');
+            $client_url = $this->rc->config->get('kolab_files_url');
+            $server_url = $this->rc->config->get('kolab_files_server_url');
 
-            if (!$url) {
+            if (!$client_url) {
                 return $this->engine = false;
             }
 
             require_once $this->home . '/lib/kolab_files_engine.php';
 
-            $this->engine = new kolab_files_engine($this, $url);
+            $this->engine = new kolab_files_engine($this, $client_url, $server_url);
         }
 
         return $this->engine;
@@ -145,4 +149,25 @@ class kolab_files extends rcube_plugin
 
         new kolab_files_autocomplete($this);
     }
+
+    /**
+     * Update chwala config on user preferences change
+     */
+    public function preferences_save($props)
+    {
+        if ($props['section'] == 'general') {
+            $dont_override = (array) $this->rc->config->get('dont_override');
+            $prefs         = array();
+
+            foreach (array('timezone', 'date_long') as $idx) {
+                if (isset($props['prefs'][$idx]) && !in_array($idx, $dont_override)) {
+                    $prefs[$idx] = $props['prefs'][$idx];
+                }
+            }
+
+            if (!empty($prefs) && ($engine = $this->engine())) {
+                $engine->configure(false, $prefs);
+            }
+        }
+    }
 }
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index da5aae88..ede38542 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -26,19 +26,22 @@ class kolab_files_engine
 {
     private $plugin;
     private $rc;
+    private $url;
+    private $url_srv;
     private $timeout = 600;
     private $files_sort_cols    = array('name', 'mtime', 'size');
     private $sessions_sort_cols = array('name');
 
-    const API_VERSION = 2;
+    const API_VERSION = 4;
 
 
     /**
      * Class constructor
      */
-    public function __construct($plugin, $url)
+    public function __construct($plugin, $client_url, $server_url = null)
     {
-        $this->url     = rcube_utils::resolve_url($url);
+        $this->url     = rtrim(rcube_utils::resolve_url($client_url), '/ ');
+        $this->url_srv = $server_url ? rtrim(rcube_utils::resolve_url($server_url), '/ ') : $this->url;
         $this->plugin  = $plugin;
         $this->rc      = $plugin->rc;
         $this->timeout = $this->rc->config->get('session_lifetime') * 60;
@@ -101,6 +104,9 @@ class kolab_files_engine
 
             // get list of external sources
             $this->get_external_storage_drivers();
+
+            // these labels may be needed even if fetching ext sources failed
+            $this->plugin->add_label('folderauthtitle', 'authenticating', 'foldershare');
         }
 
         if ($list_widget) {
@@ -121,9 +127,15 @@ class kolab_files_engine
                 'classsel'   => 'button-files button-selected',
                 'innerclass' => 'button-inner',
                 'label'      => 'kolab_files.files',
+                'type'       => 'link'
                 ), 'taskbar');
         }
 
+        if ($_SESSION['kolab_files_caps']['MANTICORE'] || $_SESSION['kolab_files_caps']['WOPI']) {
+            $_SESSION['kolab_files_caps']['DOCEDIT'] = true;
+            $_SESSION['kolab_files_caps']['DOCTYPE'] = $_SESSION['kolab_files_caps']['MANTICORE'] ? 'manticore' : 'wopi';
+        }
+
         $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
         $this->plugin->include_script($this->url . '/js/files_api.js');
         $this->plugin->include_script('kolab_files.js');
@@ -131,9 +143,10 @@ class kolab_files_engine
         $this->rc->output->set_env('files_url', $this->url . '/api/');
         $this->rc->output->set_env('files_token', $this->get_api_token());
         $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
+        $this->rc->output->set_env('files_api_version', $_SESSION['kolab_files_caps']['VERSION'] ?: 3);
         $this->rc->output->set_env('files_user', $this->rc->get_user_name());
 
-        if ($_SESSION['kolab_files_caps']['MANTICORE']) {
+        if ($_SESSION['kolab_files_caps']['DOCEDIT']) {
             $this->plugin->add_label('declinednotice', 'invitednotice', 'acceptedownernotice',
                 'declinedownernotice', 'requestednotice', 'acceptednotice', 'declinednotice',
                 'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
@@ -224,7 +237,7 @@ class kolab_files_engine
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('foldercreating', 'foldercreatenotice', 'create', 'foldercreate', 'cancel');
+        $this->plugin->add_label('foldercreating', 'foldercreatenotice', 'create', 'foldercreate', 'cancel', 'addfolder');
         $this->rc->output->add_gui_object('folder-create-form', $attrib['id']);
 
         return $out;
@@ -244,9 +257,9 @@ class kolab_files_engine
         $select_parent = new html_select(array('id' => 'folder-edit-parent', 'name' => 'parent'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        $table->add('title', html::label('folder-name', rcube::Q($this->plugin->gettext('foldername'))));
+        $table->add('title', html::label('folder-edit-name', rcube::Q($this->plugin->gettext('foldername'))));
         $table->add(null, $input_name->show());
-        $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
+        $table->add('title', html::label('folder-edit-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
@@ -306,7 +319,7 @@ class kolab_files_engine
                 . html::img(array('src' => $source['image'], 'alt' => $key, 'title' => $source['name']))
                 . html::div(null, html::span('name', rcube::Q($source['name']))
                     . html::br()
-                    . html::span('description', rcube::Q($source['description']))
+                    . html::span('description hint', rcube::Q($source['description']))
                     . $form->show()
                 );
 
@@ -336,15 +349,151 @@ class kolab_files_engine
         $checkbox = new html_checkbox(array(
             'name'  => 'store_passwords',
             'value' => '1',
+            'class' => 'pretty-checkbox',
             'id'    => 'auth-pass-checkbox' . $attrib['suffix'],
         ));
 
         return html::div('auth-options', $checkbox->show(). '&nbsp;'
             . html::label('auth-pass-checkbox' . $attrib['suffix'], $this->plugin->gettext('storepasswords'))
-            . html::span('description', $this->plugin->gettext('storepasswordsdesc'))
+            . html::p('description hint', $this->plugin->gettext('storepasswordsdesc'))
         );
     }
 
+    /**
+     * Template object for sharing form
+     */
+    public function folder_share_form($attrib)
+    {
+        $folder = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_GET, true);
+
+        $info = $this->get_share_info($folder);
+
+        if (empty($info) || empty($info['form'])) {
+            $msg = $this->plugin->gettext($info === false ? 'sharepermissionerror' : 'sharestorageerror');
+            return html::div(array('class' => 'boxerror', 'id' => 'share-notice'), rcube::Q($msg));
+        }
+
+        if (empty($attrib['id'])) {
+            $attrib['id'] = 'foldershareform';
+        }
+
+        $out = '';
+
+        foreach ($info['form'] as $mode => $tab) {
+            $table  = new html_table(array(
+                    'cols'        => ($tab['list_column'] ? 1 : count($tab['form'])) + 1,
+                    'data-mode'   => $mode,
+                    'data-single' => $tab['single'] ? 1 : 0,
+            ));
+            $submit = new html_button(array('class' => 'btn btn-secondary submit'));
+            $delete = new html_button(array('class' => 'btn btn-secondary btn-danger delete'));
+            $fields = array();
+
+            // Table header
+            if (!empty($tab['list_column'])) {
+                $table->add_header(null, rcube::Q($tab['list_column_label']));
+            }
+            else {
+                foreach ($tab['form'] as $field) {
+                    $table->add_header(null, rcube::Q($field['title']));
+                }
+            }
+            $table->add_header(null, '');
+
+            // Submit form
+            $record = '';
+            foreach ($tab['form'] as $index => $field) {
+                $add = '';
+                if ($field['type'] == 'select') {
+                    $ff = new html_select(array('name' => $index));
+                    foreach ($field['options'] as $opt_idx => $opt) {
+                        $ff->add($opt, $opt_idx);
+                    }
+                }
+                else if ($field['type'] == 'password') {
+                    $ff = new html_passwordfield(array(
+                            'name'        => $index,
+                            'placeholder' => $this->rc->gettext('password'),
+                    ));
+                    $add = new html_passwordfield(array(
+                            'name'        => $index . 'confirm',
+                            'placeholder' => $this->plugin->gettext('confirmpassword'),
+                    ));
+                    $add = $add->show();
+                }
+                else {
+                    $ff = new html_inputfield(array(
+                            'name'              => $index,
+                            'data-autocomplete' => $field['autocomplete'],
+                            'placeholder'       => $field['placeholder'],
+                    ));
+                }
+
+                if (!empty($tab['list_column'])) {
+                    $record .= $ff->show() . $add;
+                }
+                else {
+                    $table->add(null, $ff->show() . $add);
+                }
+                $fields[$index] = $ff;
+            }
+
+            if (!empty($tab['list_column'])) {
+                $table->add('form', $record);
+            }
+
+            $hidden = '';
+            foreach ((array) $tab['extra_fields'] as $key => $default) {
+                $h = new html_hiddenfield(array('name' => $key, 'value' => $default));
+                $hidden .= $h->show();
+            }
+
+            $table->add(null, $hidden . $submit->show(rcube::Q($tab['label'] ?: $this->plugin->gettext('submit'))));
+
+            // Existing entries
+            foreach ((array) $info['rights'] as $entry) {
+                if ($entry['mode'] == $mode) {
+                    if (!empty($tab['list_column'])) {
+                        $table->add(null, html::span('name', rcube::Q($entry[$tab['list_column']])));
+                    }
+                    else {
+                        foreach ($tab['form'] as $index => $field) {
+                            if ($fields[$index] instanceof html_select) {
+                                $table->add(null, $fields[$index]->show($entry[$index]));
+                            }
+                            else if ($fields[$index] instanceof html_inputfield) {
+                                $table->add(null, html::span('name', rcube::Q($entry[$index])));
+                            }
+                        }
+                    }
+
+                    $hidden = '';
+                    foreach ((array) $tab['extra_fields'] as $key => $default) {
+                        if (isset($entry[$key])) {
+                            $h = new html_hiddenfield(array('name' => $key, 'value' => $entry[$key]));
+                            $hidden .= $h->show();
+                        }
+                    }
+
+                    $table->add(null, $hidden . $delete->show(rcube::Q($this->rc->gettext('delete'))));
+                }
+            }
+
+            $this->rc->output->add_label('kolab_files.updatingfolder' . $mode);
+
+            $out .= html::tag('fieldset', $mode, html::tag('legend', null, rcube::Q($tab['title'])) . $table->show()) . "\n";
+        }
+
+        $this->rc->autocomplete_init();
+
+        $this->rc->output->set_env('folder', $folder);
+        $this->rc->output->set_env('form_info', $info['form']);
+        $this->rc->output->add_gui_object('shareform', $attrib['id']);
+        $this->rc->output->add_label('kolab_files.submit', 'kolab_files.passwordconflict', 'delete');
+
+        return html::div($attrib, $out);
+    }
+
     /**
      * Template object for file edit dialog/warnings
      */
@@ -374,28 +523,29 @@ class kolab_files_engine
      */
     public function document_editors_dialog($attrib)
     {
-        $table = new html_table(array('cols' => 3, 'border' => 0, 'cellpadding' => 0, 'class' => 'records-table'));
+        $table = new html_table($attrib + array('cols' => 3, 'border' => 0, 'cellpadding' => 0));
 
         $table->add_header('username', $this->plugin->gettext('participant'));
         $table->add_header('status', $this->plugin->gettext('status'));
         $table->add_header('options', null);
 
-        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30));
+        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30, 'class' => 'form-control'));
         $textarea = new html_textarea(array('name' => 'comment', 'id' => 'invitation-comment',
-            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('invitationtexttitle')));
-        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add', 'value' => $this->plugin->gettext('addparticipant')));
+            'rows' => 4, 'cols' => 55, 'class' => 'form-control', 'title' => $this->plugin->gettext('invitationtexttitle')));
+        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add',
+            'value' => $this->plugin->gettext('addparticipant')));
 
-        $this->plugin->add_label('manageeditors', 'statusorganizer');
+        $this->plugin->add_label('manageeditors', 'statusorganizer', 'addparticipant');
 
         // initialize attendees autocompletion
         $this->rc->autocomplete_init();
 
-        return '<div>' . $table->show() . html::div(null,
-            html::div(null, $input->show() . " " . $button->show())
+        return html::div(null, $table->show() . html::div(null,
+            html::div('form-searchbar', $input->show() . " " . $button->show())
             . html::p('attendees-commentbox', html::label(null,
                 $this->plugin->gettext('invitationtextlabel') . $textarea->show())
             )
-        ) . '</div>';
+        ));
     }
 
     /**
@@ -442,23 +592,18 @@ class kolab_files_engine
         $select_type   = new html_select(array('id' => 'file-create-type', 'name' => 'type'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        // @TODO: get this list from Chwala API
-        $types = array(
-            'application/vnd.oasis.opendocument.text' => 'odt',
-            'text/plain' => 'txt',
-            'text/html'  => 'html',
-        );
-        foreach (array_keys($types) as $type) {
-            list ($app, $label) = explode('/', $type);
-            $label = preg_replace('/[^a-z]/', '', $label);
-            $select_type->add($this->plugin->gettext('type.' . $label), $type);
+        $types = array();
+
+        foreach ($this->get_mimetypes('edit') as $type => $mimetype) {
+            $types[$type] = $mimetype['ext'];
+            $select_type->add($mimetype['label'], $type);
         }
 
         $table->add('title', html::label('file-create-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
         $table->add('title', html::label('file-create-type', rcube::Q($this->plugin->gettext('type'))));
         $table->add(null, $select_type->show());
-        $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
+        $table->add('title', html::label('file-create-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
@@ -481,32 +626,16 @@ class kolab_files_engine
      */
     public function file_search_form($attrib)
     {
-        $attrib['name'] = '_q';
-
-        if (empty($attrib['id'])) {
-            $attrib['id'] = 'filesearchbox';
-        }
-        if ($attrib['type'] == 'search' && !$this->rc->output->browser->khtml) {
-            unset($attrib['type'], $attrib['results']);
-        }
-
-        $input_q = new html_inputfield($attrib);
-        $out = $input_q->show();
-
-        // add some labels to client
-        $this->rc->output->add_label('searching');
-        $this->rc->output->add_gui_object('filesearchbox', $attrib['id']);
+        $attrib += array(
+            'name'          => '_q',
+            'gui-object'    => 'filesearchbox',
+            'form-name'     => 'filesearchform',
+            'command'       => 'files-search',
+            'reset-command' => 'files-search-reset',
+        );
 
         // add form tag around text field
-        if (empty($attrib['form'])) {
-            $out = $this->rc->output->form_tag(array(
-                    'action'   => '?_task=files',
-                    'name'     => "filesearchform",
-                    'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('files-search'); return false",
-                ), $out);
-        }
-
-        return $out;
+        return $this->rc->output->search_form($attrib);
     }
 
     /**
@@ -710,20 +839,20 @@ class kolab_files_engine
         $table = new html_table(array('cols' => 2, 'class' => $attrib['class']));
 
         // file name
-        $table->add('label', $this->plugin->gettext('name').':');
+        $table->add('title', $this->plugin->gettext('name').':');
         $table->add('data filename', $this->file_data['name']);
 
         // file type
         // @TODO: human-readable type name
-        $table->add('label', $this->plugin->gettext('type').':');
+        $table->add('title', $this->plugin->gettext('type').':');
         $table->add('data filetype', $this->file_data['type']);
 
         // file size
-        $table->add('label', $this->plugin->gettext('size').':');
+        $table->add('title', $this->plugin->gettext('size').':');
         $table->add('data filesize', $this->rc->show_bytes($this->file_data['size']));
 
         // file modification time
-        $table->add('label', $this->plugin->gettext('mtime').':');
+        $table->add('title', $this->plugin->gettext('mtime').':');
         $table->add('data filemtime', $this->file_data['mtime']);
 
         // @TODO: for images: width, height, color depth, etc.
@@ -766,7 +895,27 @@ class kolab_files_engine
         $attrib['src']             = $href;
         $attrib['onload']          = 'kolab_files_frame_load(this)';
 
-        return html::iframe($attrib);
+        // editor requires additional arguments via POST
+        if (!empty($this->file_data['viewer']['post'])) {
+            $attrib['src'] = 'program/resources/blank.gif';
+
+            $form_content = new html_hiddenfield();
+            $form_attrib  = array(
+                'action' => $href,
+                'id'     => $attrib['id'] . '-form',
+                'target' => $attrib['name'],
+                'method' => 'post',
+            );
+
+            foreach ($this->file_data['viewer']['post'] as $name => $value) {
+                $form_content->add(array('name' => $name, 'value' => $value));
+            }
+
+            $form = html::tag('form', $form_attrib, $form_content->show())
+                . html::script(array(), "\$('#{$attrib['id']}-form').submit()");
+        }
+
+        return html::iframe($attrib) . $form;
     }
 
     /**
@@ -797,7 +946,7 @@ class kolab_files_engine
                 $quota = $body['result'];
             }
             else {
-                throw new Exception($body['reason']);
+                throw new Exception($body['reason'] ?: "Failed to get quota. Status: $status");
             }
         }
         catch (Exception $e) {
@@ -815,7 +964,7 @@ class kolab_files_engine
     /**
      * Get API token for current user session, authenticate if needed
      */
-    public function get_api_token()
+    public function get_api_token($configure = true)
     {
         $token = $_SESSION['kolab_files_token'];
         $time  = $_SESSION['kolab_files_time'];
@@ -850,6 +999,10 @@ class kolab_files_engine
             $url->setQueryVariables(array('method' => 'authenticate', 'version' => self::API_VERSION));
             $request->setUrl($url);
             $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
+
+            // Allow plugins (e.g. kolab_sso) to modify the request
+            $this->rc->plugins->exec_hook('chwala_authenticate', array('request' => $request));
+
             $response = $request->send();
             $status   = $response->getStatus();
 
@@ -865,6 +1018,11 @@ class kolab_files_engine
             else {
                 throw new Exception(sprintf("Authenticate error (Status: %d)", $status));
             }
+
+            // Configure session
+            if ($configure && $token) {
+                $this->configure($token);
+            }
         }
         catch (Exception $e) {
             rcube::raise_error($e, true, false);
@@ -878,7 +1036,7 @@ class kolab_files_engine
      */
     protected function get_request($get = null, $token = null)
     {
-        $url = $this->url . '/api/';
+        $url = $this->url_srv . '/api/';
 
         if (!$this->request) {
             $config = array(
@@ -913,16 +1071,54 @@ class kolab_files_engine
         // some HTTP server configurations require this header
         $this->request->setHeader('accept', "application/json,text/javascript,*/*");
 
+        // Localization
+        $this->request->setHeader('accept-language', $_SESSION['language']);
+
+        // set Referer which is used as an origin for cross-window
+        // communication with document editor iframe
+        $host = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+        $this->request->setHeader('referer', $host);
+
         return $this->request;
     }
 
+    /**
+     * Configure chwala session
+     */
+    public function configure($token = null, $prefs = array())
+    {
+        if (!$token) {
+            $token = $this->get_api_token(false);
+        }
+
+        try {
+            // Configure session
+            $query = array(
+                'method'      => 'configure',
+                'timezone'    => $prefs['timezone'] ?: $this->rc->config->get('timezone'),
+                'date_format' => $prefs['date_long'] ?: $this->rc->config->get('date_long', 'Y-m-d H:i'),
+            );
+
+            $request  = $this->get_request($query, $token);
+            $response = $request->send();
+            $status   = $response->getStatus();
+
+            if ($status != 200) {
+                throw new Exception(sprintf("Failed to configure chwala session (Status: %d)", $status));
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, false);
+        }
+    }
+
     /**
      * Handler for main files interface (Files task)
      */
     protected function action_index()
     {
         $this->plugin->add_label(
-            'uploading', 'attaching', 'searching', 'uploadsizeerror',
+            'uploading', 'attaching', 'uploadsizeerror',
             'filedeleting', 'filedeletenotice', 'filedeleteconfirm',
             'filemoving', 'filemovenotice', 'filemoveconfirm', 'filecopying', 'filecopynotice',
             'fileskip', 'fileskipall', 'fileoverwrite', 'fileoverwriteall'
@@ -930,6 +1126,11 @@ class kolab_files_engine
 
         $this->folder_list_env();
 
+        if ($this->rc->task == 'files') {
+            $this->rc->output->set_env('folder', rcube_utils::get_input_value('folder', rcube_utils::INPUT_GET));
+            $this->rc->output->set_env('collection', rcube_utils::get_input_value('collection', rcube_utils::INPUT_GET));
+        }
+
         $this->rc->output->add_label('uploadprogress', 'GB', 'MB', 'KB', 'B');
         $this->rc->output->set_pagetitle($this->plugin->gettext('files'));
         $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
@@ -1012,6 +1213,16 @@ class kolab_files_engine
         $this->file_opener(intval($_GET['_viewer']));
     }
 
+    /**
+     * Handler for folder sharing action
+     */
+    protected function action_share()
+    {
+        $this->rc->output->add_handler('share-form', array($this, 'folder_share_form'));
+
+        $this->rc->output->send('kolab_files.share');
+    }
+
     /**
      * Handler for "save all attachments into cloud" action
      */
@@ -1076,7 +1287,7 @@ class kolab_files_engine
                     $files[] = $attach_name;
                 }
                 else {
-                    throw new Exception($body['reason']);
+                    throw new Exception($body['reason'] ?: "Failed to post file_upload. Status: $status");
                 }
             }
             catch (Exception $e) {
@@ -1165,7 +1376,7 @@ class kolab_files_engine
                     $file_params = $body['result'];
                 }
                 else {
-                    throw new Exception($body['reason']);
+                    throw new Exception($body['reason'] ?: "Failed to get file_info. Status: $status");
                 }
             }
             catch (Exception $e) {
@@ -1220,37 +1431,7 @@ class kolab_files_engine
             $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
 
             if ($attachment['status'] && !$attachment['abort']) {
-                $id = $attachment['id'];
-
-                // store new attachment in session
-                unset($attachment['data'], $attachment['status'], $attachment['abort']);
-                $COMPOSE['attachments'][$id] = $attachment;
-
-                if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
-                    $button = html::img(array(
-                        'src' => $icon,
-                        'alt' => $this->rc->gettext('delete')
-                    ));
-                }
-                else {
-                    $button = rcube::Q($this->rc->gettext('delete'));
-                }
-
-                $content = html::a(array(
-                    'href' => "#delete",
-                    'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
-                    'title' => $this->rc->gettext('delete'),
-                    'class' => 'delete',
-                ), $button);
-
-                $content .= rcube::Q($attachment['name']);
-
-                $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
-                    'html'      => $content,
-                    'name'      => $attachment['name'],
-                    'mimetype'  => $attachment['mimetype'],
-                    'classname' => rcmail_filetype2classname($attachment['mimetype'], $attachment['name']),
-                    'complete'  => true), $uploadid);
+                $this->compose_attach_success($attachment, $COMPOSE, $COMPOSE_ID, $uploadid);
             }
             else if ($attachment['error']) {
                 $errors[] = $attachment['error'];
@@ -1280,11 +1461,13 @@ class kolab_files_engine
 
             switch ($this->rc->task) {
             case 'tasks':
-                libcalendaring::get_instance()->attachment_upload(tasklist::SESSION_KEY);
+                $handler = new kolab_attachments_handler();
+                $handler->attachment_upload(tasklist::SESSION_KEY);
                 break;
 
             case 'calendar':
-                libcalendaring::get_instance()->attachment_upload(calendar::SESSION_KEY, 'cal-');
+                $handler = new kolab_attachments_handler();
+                $handler->attachment_upload(calendar::SESSION_KEY, 'cal-');
                 break;
             }
         }
@@ -1294,6 +1477,66 @@ class kolab_files_engine
         $this->rc->output->send();
     }
 
+    protected function compose_attach_success($attachment, $COMPOSE, $COMPOSE_ID, $uploadid)
+    {
+        $id = $attachment['id'];
+
+        // store new attachment in session
+        unset($attachment['data'], $attachment['status'], $attachment['abort']);
+        $this->rc->session->append('compose_data_' . $COMPOSE_ID . '.attachments', $id, $attachment);
+
+        if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
+            $button = html::img(array(
+                'src' => $icon,
+                'alt' => $this->rc->gettext('delete')
+            ));
+        }
+        else if ($COMPOSE['textbuttons']) {
+            $button = rcube::Q($this->rc->gettext('delete'));
+        }
+        else {
+            $button = '';
+        }
+
+        if (version_compare(version_parse(RCMAIL_VERSION), '1.3.0', '>=')) {
+            $link_content = sprintf('%s <span class="attachment-size"> (%s)</span>',
+                rcube::Q($attachment['name']), $this->rc->show_bytes($attachment['size']));
+
+            $content_link = html::a(array(
+                    'href'    => "#load",
+                    'class'   => 'filename',
+                    'onclick' => sprintf("return %s.command('load-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
+                ), $link_content);
+
+            $delete_link = html::a(array(
+                    'href'    => "#delete",
+                    'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
+                    'title'   => $this->rc->gettext('delete'),
+                    'class'   => 'delete',
+                    'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
+                ), $button);
+
+            $content = $COMPOSE['icon_pos'] == 'left' ? $delete_link.$content_link : $content_link.$delete_link;
+        }
+        else {
+            $content = html::a(array(
+                    'href'    => "#delete",
+                    'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
+                    'title'   => $this->rc->gettext('delete'),
+                    'class'   => 'delete',
+            ), $button);
+
+            $content .= rcube::Q($attachment['name']);
+        }
+
+        $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
+            'html'      => $content,
+            'name'      => $attachment['name'],
+            'mimetype'  => $attachment['mimetype'],
+            'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
+            'complete'  => true), $uploadid);
+    }
+
     /**
      * Handler for file open/edit action
      */
@@ -1321,7 +1564,7 @@ class kolab_files_engine
                 $this->file_data = $body['result'];
             }
             else {
-                throw new Exception($body['reason']);
+                throw new Exception($body['reason'] ?: "Failed to get file_info. Status: $status");
             }
         }
         catch (Exception $e) {
@@ -1337,7 +1580,7 @@ class kolab_files_engine
 
         $this->file_data['filename'] = $file;
 
-        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
+        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice', 'terminate');
 
         // register template objects for dialogs (and main interface)
         $this->rc->output->add_handlers(array(
@@ -1346,36 +1589,80 @@ class kolab_files_engine
         ));
 
         $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
-        $manticore = ($viewer & 4) && $this->file_data['viewer']['manticore'];
+
+        if ($this->file_data['viewer']['wopi']) {
+            $editor_type = 'wopi';
+            $got_editor  = ($viewer & 4);
+        }
+        else if ($this->file_data['viewer']['manticore']) {
+            $editor_type = 'manticore';
+            $got_editor = ($viewer & 4);
+        }
 
         // this one is for styling purpose
         $this->rc->output->set_env('extwin', true);
         $this->rc->output->set_env('file', $file);
         $this->rc->output->set_env('file_data', $this->file_data);
+        $this->rc->output->set_env('mimetype', $this->file_data['type']);
+        $this->rc->output->set_env('filename', pathinfo($file, PATHINFO_BASENAME));
+        $this->rc->output->set_env('editor_type', $editor_type);
         $this->rc->output->set_env('photo_placeholder', $placeholder);
         $this->rc->output->set_pagetitle(rcube::Q($file));
-        $this->rc->output->send('kolab_files.' . ($manticore ? 'docedit' : 'filepreview'));
+        $this->rc->output->send('kolab_files.' . ($got_editor ? 'docedit' : 'filepreview'));
     }
 
     /**
      * Returns mimetypes supported by File API viewers
      */
-    protected function get_mimetypes()
+    protected function get_mimetypes($type = 'view')
     {
-        $token   = $this->get_api_token();
-        $request = $this->get_request(array('method' => 'mimetypes'), $token);
+        $mimetypes = array();
 
         // send request to the API
         try {
-            $response = $request->send();
-            $status   = $response->getStatus();
-            $body     = @json_decode($response->getBody(), true);
+            if ($this->mimetypes === null) {
+                $this->mimetypes = false;
 
-            if ($status == 200 && $body['status'] == 'OK') {
-                $mimetypes = $body['result'];
+                $token    = $this->get_api_token();
+                $request  = $this->get_request(array('method' => 'mimetypes'), $token);
+                $response = $request->send();
+                $status   = $response->getStatus();
+                $body     = @json_decode($response->getBody(), true);
+
+                if ($status == 200 && $body['status'] == 'OK') {
+                    $this->mimetypes = $body['result'];
+                }
+                else {
+                    throw new Exception($body['reason'] ?: "Failed to get mimetypes. Status: $status");
+                }
             }
-            else {
-                throw new Exception($body['reason']);
+
+            if (is_array($this->mimetypes)) {
+                if (array_key_exists($type, $this->mimetypes)) {
+                    $mimetypes = $this->mimetypes[$type];
+                }
+                // fallback to static definition if old Chwala is used
+                else if ($type == 'edit') {
+                    $mimetypes = array(
+                        'text/plain' => 'txt',
+                        'text/html'  => 'html',
+                    );
+                    if (!empty($_SESSION['kolab_files_caps']['MANTICORE'])) {
+                        $mimetypes = array_merge(array('application/vnd.oasis.opendocument.text' => 'odt'), $mimetypes);
+                    }
+
+                    foreach (array_keys($mimetypes) as $type) {
+                        list ($app, $label) = explode('/', $type);
+                        $label = preg_replace('/[^a-z]/', '', $label);
+                        $mimetypes[$type] = array(
+                            'ext'   => $mimetypes[$type],
+                            'label' => $this->plugin->gettext('type.' . $label),
+                        );
+                    }
+                }
+                else {
+                    $mimetypes = $this->mimetypes;
+                }
             }
         }
         catch (Exception $e) {
@@ -1407,7 +1694,7 @@ class kolab_files_engine
                 $sources = $body['result'];
             }
             else {
-                throw new Exception($body['reason']);
+                throw new Exception($body['reason'] ?: "Failed to get folder_types. Status: $status");
             }
         }
         catch (Exception $e) {
@@ -1418,6 +1705,39 @@ class kolab_files_engine
         $this->rc->output->set_env('external_sources', $sources);
     }
 
+    /**
+     * Get folder share dialog data
+     */
+    protected function get_share_info($folder)
+    {
+        // first get configured sources from Chwala
+        $token   = $this->get_api_token();
+        $request = $this->get_request(array('method' => 'sharing', 'folder' => $folder), $token);
+
+        // send request to the API
+        try {
+            $response = $request->send();
+            $status   = $response->getStatus();
+            $body     = @json_decode($response->getBody(), true);
+
+            if ($status == 200 && $body['status'] == 'OK') {
+                $info = $body['result'];
+            }
+            else if ($body['code'] == 530) {
+                return false;
+            }
+            else {
+                throw new Exception($body['reason'] ?: "Failed to get sharing form information. Status: $status");
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, false);
+            return;
+        }
+
+        return $info;
+    }
+
     /**
      * Registers translation labels for folder lists in UI
      */
@@ -1427,7 +1747,7 @@ class kolab_files_engine
         $this->plugin->add_label(
             'folderdeleting', 'folderdeleteconfirm', 'folderdeletenotice',
             'collection_audio', 'collection_video', 'collection_image', 'collection_document',
-            'additionalfolders', 'listpermanent'
+            'additionalfolders', 'listpermanent', 'storageautherror'
         );
         $this->rc->output->add_label('foldersubscribing', 'foldersubscribed',
             'folderunsubscribing', 'folderunsubscribed', 'searching'
diff --git a/plugins/kolab_files/localization/bg_BG.inc b/plugins/kolab_files/localization/bg_BG.inc
index d702c35b..50026ba7 100644
--- a/plugins/kolab_files/localization/bg_BG.inc
+++ b/plugins/kolab_files/localization/bg_BG.inc
@@ -13,4 +13,15 @@ $labels['folderinside'] = 'Внасяне вътре';
 $labels['name'] = 'Име';
 $labels['edit'] = 'Промяна';
 $labels['save'] = 'Запис';
-?>
+$labels['listpermanent'] = 'Постоянен списък';
+$labels['select'] = 'Избиране';
+$labels['participant'] = 'Участник';
+$labels['status'] = 'Статус';
+$labels['addparticipant'] = 'Добавяне на участник';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Организатор';
+$labels['removeparticipant'] = 'Изтриване';
+$labels['accept'] = 'Приемане';
+$labels['decline'] = 'Отхвърляне';
+$labels['owner'] = 'Собственик';
+$labels['comment'] = 'Коментар';
diff --git a/plugins/kolab_files/localization/ca_ES.inc b/plugins/kolab_files/localization/ca_ES.inc
index 659ed9cf..4ce4f1f8 100644
--- a/plugins/kolab_files/localization/ca_ES.inc
+++ b/plugins/kolab_files/localization/ca_ES.inc
@@ -12,4 +12,13 @@ $labels['folderinside'] = 'Insereix dins';
 $labels['name'] = 'Nom';
 $labels['edit'] = 'Edita';
 $labels['save'] = 'Desa';
-?>
+$labels['listpermanent'] = 'Llista permanentment';
+$labels['select'] = 'Selecciona';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Estat';
+$labels['addparticipant'] = 'Afegeix participant';
+$labels['invitationtextlabel'] = 'Comentari de la invitació/notificació';
+$labels['statusorganizer'] = 'Organitzador';
+$labels['removeparticipant'] = 'Suprimeix';
+$labels['owner'] = 'Propietari';
+$labels['comment'] = 'Comentari';
diff --git a/plugins/kolab_files/localization/cs_CZ.inc b/plugins/kolab_files/localization/cs_CZ.inc
index 74e8fd42..7b987ea5 100644
--- a/plugins/kolab_files/localization/cs_CZ.inc
+++ b/plugins/kolab_files/localization/cs_CZ.inc
@@ -32,18 +32,27 @@ $labels['get'] = 'Stáhnout';
 $labels['getfile'] = 'Stáhnout soubor';
 $labels['view'] = 'Zobrazit';
 $labels['viewfile'] = 'Zobrazit soubor';
-$labels['rename'] = 'Přejmenovat soubor';
+$labels['rename'] = 'Přejmenovat';
 $labels['deletefile'] = 'Smazat soubor(y)';
 $labels['edit'] = 'Upravit';
 $labels['editfile'] = 'Upravit soubor';
 $labels['save'] = 'Uložit';
 $labels['savefile'] = 'Uložit soubor';
 $labels['printfile'] = 'Tisk souboru';
-$labels['fileedit'] = 'Vlastnosti souboru';
+$labels['renamefile'] = 'Přejmenovat soubor';
+$labels['createfile'] = 'Vytvořit soubor';
+$labels['createandedit'] = 'Vytvořit a upravit';
+$labels['copyfile'] = 'Kopírovat soubor';
+$labels['copyandedit'] = 'Kopírovat a upravit';
+$labels['documenttitle'] = 'Název:';
+$labels['close'] = 'Zavřít';
+$labels['submit'] = 'Odeslat';
+$labels['confirmpassword'] = 'Potvrdit heslo';
 $labels['collection_audio'] = 'Zvuk';
 $labels['collection_video'] = 'Obraz';
 $labels['collection_image'] = 'Obrázky';
 $labels['collection_document'] = 'Dokumenty';
+$labels['sessions'] = 'Sezení';
 $labels['uploading'] = 'Nahrávání soubor(ů)...';
 $labels['attaching'] = 'Připojuje se soubor(y)...';
 $labels['authenticating'] = 'Ověřuje se...';
@@ -56,10 +65,12 @@ $labels['folderdeletenotice'] = 'Složka byla úspěšně smazána.';
 $labels['folderupdatenotice'] = 'Složka aktualizována.';
 $labels['foldercreatenotice'] = 'Složka úspěšně vytvořena.';
 $labels['foldermountnotice'] = 'Úložiště bylo úspěšně přidáno.';
+$labels['folderauthtitle'] = 'Přihlášení k $title';
 $labels['saveallnotice'] = 'Úspěšně uloženo $n soubor(ů).';
 $labels['saveallerror'] = 'Ukládání $n souborů selhalo.';
 $labels['attacherror'] = 'Nepodařilo se připojit soubor(y) ze serveru';
 $labels['fileupdating'] = 'Aktualizuje se soubor...';
+$labels['filecreating'] = 'Vytváří se soubor...';
 $labels['filemoving'] = 'Přesouvají se soubor(y)...';
 $labels['filecopying'] = 'Kopíruje se soubor(y)...';
 $labels['filedeleting'] = 'Maže se soubor(y)...';
@@ -68,12 +79,67 @@ $labels['filedeletenotice'] = 'Soubor(y) úspěšně smazány.';
 $labels['filemovenotice'] = 'Soubor(y) úspěšně přesunuty.';
 $labels['filecopynotice'] = 'Soubor(y) úspěšně zkopírovány.';
 $labels['uploadsizeerror'] = 'Dosažena maximální velikost ($size) souboru!';
+$labels['listpermanent'] = 'Ukazovat seznam trvale';
+$labels['additionalfolders'] = 'Přidat složky';
 $labels['allfolders'] = 'Hledat ve všech složkách';
 $labels['fileskip'] = 'Přeskočit';
 $labels['fileskipall'] = 'Přeskočit vše';
 $labels['fileoverwrite'] = 'Přepsat';
 $labels['fileoverwriteall'] = 'Přepsat vše';
 $labels['filemoveconfirm'] = 'Tato akce přepíše cílový soubor: <b>$file</b>.';
+$labels['editfiledialog'] = 'Potvrdit změnu';
+$labels['editfilesessions'] = 'Probíhají sezení na vybraném souboru. Prosím, vyberte činnost, kterou chcete vzít.';
+$labels['newsession'] = 'Vytvořit nové sezení';
+$labels['newsessionro'] = 'Vtvořit nové sezení (zkopírovat soubor do umístění pro čtení i zápis)';
+$labels['ownedsession'] = 'Pokračujte ve stávajícím sezení';
+$labels['invitedsession'] = 'Připojit se k sezení $user';
+$labels['joinsession'] = 'Požádat o pozvánku od $user';
+$labels['editfilero'] = 'Tento soubor je jen pro čtení. Chcete vytvořit a upravit kopii souboru?';
+$labels['editfilerotitle'] = ' Soubor jen pro čtení';
+$labels['select'] = 'Vybrat';
+$labels['terminatesession'] = 'Ukončit sezení';
+$labels['sessionterminatedtitle'] = 'Sezení ukončeno';
+$labels['sessionterminated'] = 'Sezení bylo ukončeno. Okno se zavře.';
+$labels['terminate'] = 'Ukončit';
+$labels['sessionterminating'] = 'Ukončuje se sezení...';
+$labels['unsavedchanges'] = 'V dokumentu jsou neuložené změny, které budou ztraceny. Chcete přesto sezení ukončit?';
+$labels['manageeditors'] = 'Pozvat k dokumentu';
+$labels['participant'] = 'Účastník';
+$labels['status'] = 'Stav';
+$labels['addparticipant'] = 'Přidat účastníka';
+$labels['delparticipant'] = 'Odebrat účastníka';
+$labels['invitationtexttitle'] = 'Tato poznámka bude připojena ke zprávě s pozváním/oznámením poslané účastníkům';
+$labels['invitationtextlabel'] = 'Poznámka k pozvání/oznámení';
+$labels['statusorganizer'] = 'Pořadatel';
+$labels['statusinvited'] = 'Pozván';
+$labels['statusaccepted'] = 'Přijato';
+$labels['statusdeclined'] = 'Odmítnuto';
+$labels['statusrequested'] = 'Požadováno';
+$labels['documentinviting'] = 'Zve se účastník(ci)...';
+$labels['documentcancelling'] = 'Odebírá se účastník(ci)...';
+$labels['removeparticipant'] = 'Odstranit';
+$labels['invitednotice'] = 'Byl(a) jste pozván(a) k upravovacímu sezení $owner.';
+$labels['acceptedownernotice'] = '$owner přijal vaši žádost o připojení se k upravovacímu sezení.';
+$labels['declinedownernotice'] = '$owner odmítl vaši žádost o připojení se k upravovacímu sezení.';
+$labels['acceptednotice'] = '$user přijal vaši pozvánku k upravovacímu sezení.';
+$labels['declinednotice'] = '$user odmítl vaši pozvánku k upravovacímu sezení.';
+$labels['requestednotice'] = '$user požádal o připojení se k upravovacímu sezení.';
+$labels['sessiondialog'] = 'Upravovací sezení dokumentu';
+$labels['sessiondialogcontent'] = 'Probíhá upravovací sezení $file vytvořeného $owner.';
+$labels['more'] = 'Více';
+$labels['accept'] = 'Přijmout';
+$labels['join'] = 'Připojit se k sezení';
+$labels['decline'] = 'Odmítnout';
+$labels['owner'] = 'Vlastník';
+$labels['when'] = 'Kdy';
+$labels['file'] = 'Soubor';
+$labels['comment'] = 'Poznámka';
+$labels['open'] = 'Otevřít';
+$labels['request'] = 'Požádat o pozvánku';
+$labels['invitationtitle'] = 'Pozvání k $file';
+$labels['invitationaccepting'] = 'Přijímá se pozvání...';
+$labels['invitationdeclining'] = 'Odmítá se pozvání...';
+$labels['invitationrequesting'] = 'Žádá se o pozvání...';
 $labels['storepasswords'] = 'Zapamatovat heslo';
 $labels['storepasswordsdesc'] = 'Uložená hesla budou šifrována. Zapněte tuto volbu pokud nechcete být dotazováni na heslo při každém přihlášení nebo pokud toto úložiště má být dostupné přes WebDAV.';
 $labels['arialabelsearchform'] = 'Hledání souborů';
@@ -81,6 +147,8 @@ $labels['arialabelquicksearchbox'] = 'Zadání hledání';
 $labels['arialabellistoptions'] = 'Volby seznamu souborů';
 $labels['arialabelfolderoptions'] = 'Činnosti složky';
 $labels['arialabelfileeditform'] = 'Úprava souboru';
+$labels['arialabelfilecreateform'] = 'Formulář na vytvoření souboru';
+$labels['arialabelfilelist'] = 'Seznam souborů';
 $labels['arialabelfoldercreateform'] = 'Vytvoření složky';
 $labels['arialabelfoldereditform'] = 'Úprava složky';
 $labels['arialabelfoldermountform'] = 'Vnější úložiště';
@@ -91,4 +159,8 @@ $labels['arialabelattachmentoptions'] = 'Volby pro ukládání příloh';
 $labels['arialabelfilesavedialog'] = 'Dialog pro ukládání souboru(ů)';
 $labels['arialabelfileprops'] = 'Vlastnosti souboru';
 $labels['arialabelfilecontent'] = 'Obsah souboru';
-?>
+$labels['arialabelfileeditdialog'] = 'Dialog úpravy souborů';
+$labels['arialabelfilesessiondialog'] = 'Upravovací sezení dokumentu';
+$labels['type.plain'] = 'Prostý textový dokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textový dokument (ODF)';
+$labels['type.html'] = 'Dokument HTML';
diff --git a/plugins/kolab_files/localization/da_DK.inc b/plugins/kolab_files/localization/da_DK.inc
index 92c8262f..fa288970 100644
--- a/plugins/kolab_files/localization/da_DK.inc
+++ b/plugins/kolab_files/localization/da_DK.inc
@@ -19,6 +19,7 @@ $labels['selectfiles'] = 'Vælg fil(er) til vedhæftning...';
 $labels['attachsel'] = 'Vedhæfte den valgte';
 $labels['foldercreate'] = 'Opret mappe';
 $labels['folderedit'] = 'Redigér mappe';
+$labels['folderrename'] = 'Omdøb mappe';
 $labels['foldermount'] = 'Tilføj lagerplads';
 $labels['folderdelete'] = 'Slet mappe';
 $labels['folderinside'] = 'Indsæt indeni';
@@ -32,18 +33,27 @@ $labels['get'] = 'Hent';
 $labels['getfile'] = 'Hent fil';
 $labels['view'] = 'Vis';
 $labels['viewfile'] = 'Vis fil';
-$labels['rename'] = 'Omdøb fil';
+$labels['rename'] = 'Omdøb';
 $labels['deletefile'] = 'Slet fil(er)';
 $labels['edit'] = 'Redigér';
 $labels['editfile'] = 'Redigér fil';
 $labels['save'] = 'Gem';
 $labels['savefile'] = 'Gem fil';
 $labels['printfile'] = 'Udskriv fil';
-$labels['fileedit'] = 'Filegenskaber';
+$labels['renamefile'] = 'Omdøb fil';
+$labels['createfile'] = 'Opret fil';
+$labels['createandedit'] = 'Opret og rediger';
+$labels['copyfile'] = 'Kopiér fil';
+$labels['copyandedit'] = 'Kopiér og rediger';
+$labels['documenttitle'] = 'Titel:';
+$labels['close'] = 'Luk';
+$labels['submit'] = 'Send';
+$labels['confirmpassword'] = 'Bekræft adgangskode';
 $labels['collection_audio'] = 'Lyd';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Billeder';
 $labels['collection_document'] = 'Dokumenter';
+$labels['sessions'] = 'Sessioner';
 $labels['uploading'] = 'Overfører fil(er)..';
 $labels['attaching'] = 'Vedhæfter fil(er)..';
 $labels['authenticating'] = 'Godkender ...';
@@ -61,6 +71,7 @@ $labels['saveallnotice'] = 'Gennemførte lagring af $n fil(er).';
 $labels['saveallerror'] = 'Lagringen af $n fil(er) mislykkedes.';
 $labels['attacherror'] = 'Mislykkedes med at vedhæfte fil(er) fra skyen';
 $labels['fileupdating'] = 'Opdaterer fil...';
+$labels['filecreating'] = 'Opretter fil...';
 $labels['filemoving'] = 'Flytter fil(er)...';
 $labels['filecopying'] = 'Kopierer fil(er)...';
 $labels['filedeleting'] = 'Sletter fil(er)...';
@@ -69,12 +80,43 @@ $labels['filedeletenotice'] = 'Sletningen af fil(er) blev gennemført.';
 $labels['filemovenotice'] = 'Flytning af fil(er) blev gennemført.';
 $labels['filecopynotice'] = 'Kopiering af fil(er) blev gennemført.';
 $labels['uploadsizeerror'] = 'Maksimal filstørrelse ($size) er overskredet!';
+$labels['listpermanent'] = 'Vis bestandigt';
 $labels['allfolders'] = 'søg i alle mapper';
 $labels['fileskip'] = 'Spring over';
 $labels['fileskipall'] = 'Spring alle over';
 $labels['fileoverwrite'] = 'Overskriv';
 $labels['fileoverwriteall'] = 'Overskriv alle';
 $labels['filemoveconfirm'] = 'Denne handling vil overskrive destinationsfilen: <b>$file</b>.';
+$labels['newsession'] = 'Opret ny session';
+$labels['editfilerotitle'] = 'Skrivebeskyttet fil';
+$labels['select'] = 'Vælg';
+$labels['participant'] = 'Deltager';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Tilføj deltager';
+$labels['delparticipant'] = 'Fjern deltager';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Inviteret';
+$labels['statusaccepted'] = 'Accepteret';
+$labels['statusdeclined'] = 'Afvist';
+$labels['statusrequested'] = 'Anmodet';
+$labels['documentinviting'] = 'Inviter deltager(ere)...';
+$labels['documentcancelling'] = 'Fjerner deltager(ere)...';
+$labels['removeparticipant'] = 'Fjern';
+$labels['more'] = 'Mere';
+$labels['accept'] = 'Acceptér';
+$labels['join'] = 'Deltag i sessionen';
+$labels['decline'] = 'Afvis';
+$labels['owner'] = 'Ejer';
+$labels['when'] = 'Hvornår';
+$labels['file'] = 'Fil';
+$labels['comment'] = 'Comment';
+$labels['open'] = 'Åbn';
+$labels['request'] = 'Anmod om invitation';
+$labels['invitationtitle'] = 'Invitation for $file';
+$labels['invitationaccepting'] = 'Accepter invitation...';
+$labels['invitationdeclining'] = 'Afvis invitation...';
+$labels['invitationrequesting'] = 'Ammod invitation';
 $labels['storepasswords'] = 'husk adgangskode';
 $labels['storepasswordsdesc'] = 'Gemte adgangskoder vil blive krypteret. Slå dette til, hvis du ikke ønsker at blive spurgt om adgangskoden ved hvert login, eller hvis du ønsker at denne lagerplads skal være tilgængelig gennem WebDAV.';
 $labels['arialabelsearchform'] = 'Formular for filsøgning';
@@ -82,6 +124,8 @@ $labels['arialabelquicksearchbox'] = 'Søgeinput';
 $labels['arialabellistoptions'] = 'Tilvalg for visning af filer';
 $labels['arialabelfolderoptions'] = 'Mappehandlinger';
 $labels['arialabelfileeditform'] = 'Formular for filredigering';
+$labels['arialabelfilecreateform'] = 'Fil oprettelsesformular';
+$labels['arialabelfilelist'] = 'List filer';
 $labels['arialabelfoldercreateform'] = 'Formular for mappeoprettelse';
 $labels['arialabelfoldereditform'] = 'Formular for mapperedigering';
 $labels['arialabelfoldermountform'] = 'Formular for ekstern lagerplads';
@@ -92,4 +136,5 @@ $labels['arialabelattachmentoptions'] = 'Tilvalg for lagring af vedhæftninger';
 $labels['arialabelfilesavedialog'] = 'Vindue for lagring af fil(er)';
 $labels['arialabelfileprops'] = 'Filegenskaber';
 $labels['arialabelfilecontent'] = 'Filindhold';
-?>
+$labels['type.vndoasisopendocumenttext'] = 'Text Dokument (ODF)';
+$labels['type.html'] = 'HTML Dokument';
diff --git a/plugins/kolab_files/localization/de_CH.inc b/plugins/kolab_files/localization/de_CH.inc
index caaa7c34..38c7deed 100644
--- a/plugins/kolab_files/localization/de_CH.inc
+++ b/plugins/kolab_files/localization/de_CH.inc
@@ -7,23 +7,136 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Dateien';
+$labels['filepreview'] = 'Datei Vorschau';
+$labels['saveall'] = 'Alles in die Cloud speichern...';
+$labels['saveto'] = 'In die Cloud speichern...';
+$labels['saveas'] = 'Speichern als:';
 $labels['create'] = 'Erstellen';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
+$labels['fromcloud'] = 'Aus der Cloud...';
+$labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen...';
+$labels['attachsel'] = 'Ausgewählte anhängen';
+$labels['foldercreate'] = 'Ordner erstellen';
+$labels['folderedit'] = 'Verzeichnis ändern';
+$labels['foldermount'] = 'Speicher hinzufügen';
+$labels['folderdelete'] = 'Ordner löschen';
 $labels['folderinside'] = 'Erstellen in';
+$labels['foldername'] = 'Ordnername';
 $labels['name'] = 'Name';
 $labels['mtime'] = 'Geändert';
 $labels['type'] = 'Typ';
+$labels['upload'] = 'Hochladen';
+$labels['uploadfile'] = 'Datei(en) hochladen';
 $labels['get'] = 'Herunterladen';
+$labels['getfile'] = 'Datei herunterladen';
+$labels['view'] = 'Ansehen';
+$labels['viewfile'] = 'Datei ansehen';
+$labels['rename'] = 'Umbenennen';
+$labels['deletefile'] = 'Datei(en) löschen';
 $labels['edit'] = 'Bearbeiten';
+$labels['editfile'] = 'Datei bearbeiten';
 $labels['save'] = 'Speichern';
+$labels['savefile'] = 'Datei speichern';
+$labels['printfile'] = 'Datei drucken';
+$labels['renamefile'] = 'Datei umbenennen';
+$labels['createfile'] = 'Datei erstellen';
+$labels['createandedit'] = 'Erstellen und Bearbeiten';
+$labels['copyfile'] = 'Datei kopieren';
+$labels['copyandedit'] = 'Kopieren und Bearbeiten';
+$labels['documenttitle'] = 'Titel:';
+$labels['close'] = 'Schließen';
+$labels['submit'] = 'Absenden';
+$labels['confirmpassword'] = 'Passwort bestätigen';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Bilder';
 $labels['collection_document'] = 'Dokumente';
+$labels['sessions'] = 'Sitzungen';
+$labels['uploading'] = 'Lade Datei(en) hoch...';
+$labels['attaching'] = 'Hänge Datei(en) an...';
+$labels['authenticating'] = 'Authentifiziere...';
+$labels['foldercreating'] = 'Erstelle Ordner...';
+$labels['folderupdating'] = 'Aktualisiere Verzeichnis...';
+$labels['foldermounting'] = 'Hinzufügen externen Speichers...';
+$labels['folderdeleting'] = 'Lösche Ordner...';
+$labels['folderdeleteconfirm'] = 'Sind Sie sicher, dass Sie den gewählten Ordner löschen möchten?';
+$labels['folderdeletenotice'] = 'Ordner erfolgreich gelöscht.';
+$labels['folderupdatenotice'] = 'Verzeichnis erfolgreich aktualisiert.';
+$labels['foldercreatenotice'] = 'Ordner erfolgreich erstellt.';
+$labels['foldermountnotice'] = 'Speicher erfolgreich hinzugefügt.';
+$labels['folderauthtitle'] = 'Einloggen zu $title';
+$labels['saveallnotice'] = '$n Datei(en) erfolgreich gespeichert.';
+$labels['saveallerror'] = 'Speichern von $n Datei(en) fehlgeschlagen.';
+$labels['attacherror'] = 'Anhängen von Datei(en) aus der Cloud fehlgeschlagen.';
+$labels['fileupdating'] = 'Aktualisiere Datei...';
+$labels['filecreating'] = 'Datei wird erstellt...';
+$labels['filemoving'] = 'Verschiebe Datei(en)...';
+$labels['filecopying'] = 'Kopiere Datei(en)...';
+$labels['filedeleting'] = 'Lösche Datei(en)...';
+$labels['filedeleteconfirm'] = 'Sind Sie sicher, dass Sie die gewählten Dateien löschen möchten?';
+$labels['filedeletenotice'] = 'Datei(en) erfolgreich gelöscht.';
+$labels['filemovenotice'] = 'Datei(en) erfolgreich verschoben.';
+$labels['filecopynotice'] = 'Datei(en) erfolgreich kopiert.';
+$labels['uploadsizeerror'] = 'Maimale Dateigröße ($size) überschritten!';
+$labels['listpermanent'] = 'Permanent anzeigen';
+$labels['additionalfolders'] = 'Zusätzliche Ordner';
+$labels['allfolders'] = 'suche in allen Ordnern';
 $labels['fileskip'] = 'Überspringen';
 $labels['fileskipall'] = 'Alle überspringen';
 $labels['fileoverwrite'] = 'Überschreiben';
 $labels['fileoverwriteall'] = 'Alle überschreiben';
 $labels['filemoveconfirm'] = 'Diese Aktion wird die Zieldatei <b>$file</b> überschreiben.';
-?>
+$labels['editfiledialog'] = 'Bearbeitungsaktion bestätigen';
+$labels['newsession'] = 'Neue Sitzung erstellen';
+$labels['editfilerotitle'] = 'Schreibgeschützte Datei';
+$labels['select'] = 'Auswählen';
+$labels['terminatesession'] = 'Sitzung beenden';
+$labels['sessionterminatedtitle'] = 'Sitzung beendet';
+$labels['terminate'] = 'Beenden';
+$labels['sessionterminating'] = 'Sitzung wird beendet...';
+$labels['participant'] = 'Teilnehmer';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Hinzufügen';
+$labels['delparticipant'] = 'Teilnehmer entfernen';
+$labels['invitationtextlabel'] = 'Kommentar zur Einladungs/Benachrichtigung';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Eingeladen';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen...';
+$labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt...';
+$labels['removeparticipant'] = 'Löschen';
+$labels['sessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['accept'] = 'Akzeptieren';
+$labels['decline'] = 'Ablehnen';
+$labels['owner'] = 'Eigentümer';
+$labels['when'] = 'Wenn';
+$labels['file'] = 'Datei';
+$labels['comment'] = 'Kommentar';
+$labels['open'] = 'Öffnen';
+$labels['invitationtitle'] = 'Einladung für $file';
+$labels['storepasswords'] = 'Passwort merken';
+$labels['storepasswordsdesc'] = 'Gespeicherte Passwörter werden verschlüsselt. Aktivieren Sie dies, wenn Sie nicht bei jedem Login nach dem Passwort gefragt werden möchten oder wenn dieser Speicher via WebDAV verfügbar sein soll.';
+$labels['arialabelsearchform'] = 'Suchformular für Dateien';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe';
+$labels['arialabellistoptions'] = 'Dateilisten Optionen';
+$labels['arialabelfolderoptions'] = 'Ordner Aktionen';
+$labels['arialabelfileeditform'] = 'Datei Bearbeiten Maske';
+$labels['arialabelfilecreateform'] = 'Datei Erstellen Maske';
+$labels['arialabelfilelist'] = 'Dateiliste';
+$labels['arialabelfoldercreateform'] = 'Ordner Erstellen Maske';
+$labels['arialabelfoldereditform'] = 'Formular Verzeichnis ändern';
+$labels['arialabelfoldermountform'] = 'Formular Externer Speicher';
+$labels['arialabelfolderauthform'] = 'Formular Authentifizierung Externer Speicher';
+$labels['arialabelfolderlist'] = 'Ordner / Sammlungs Auswahl';
+$labels['arialabelfileselectdialog'] = 'Datei Auswahl Dialog';
+$labels['arialabelattachmentoptions'] = 'Anhänge speichern Optionen';
+$labels['arialabelfilesavedialog'] = 'Datei(en) speichern Dialog';
+$labels['arialabelfileprops'] = 'Dateieigenschaften';
+$labels['arialabelfilecontent'] = 'Datei Inhalt';
+$labels['arialabelfileeditdialog'] = 'Dateibearbeitungsdialog';
+$labels['arialabelfilesessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['type.plain'] = 'Klartextdokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';
+$labels['type.html'] = 'HTML-Dokument';
diff --git a/plugins/kolab_files/localization/de_DE.inc b/plugins/kolab_files/localization/de_DE.inc
index 689487e9..4b5ce4ab 100644
--- a/plugins/kolab_files/localization/de_DE.inc
+++ b/plugins/kolab_files/localization/de_DE.inc
@@ -7,20 +7,22 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Dateien';
-$labels['filepreview'] = 'Voransicht';
-$labels['saveall'] = 'Alle in die Cloud speichern...';
-$labels['saveto'] = 'In die Cloud speichern...';
+$labels['filepreview'] = 'Dateivorschau';
+$labels['saveall'] = 'Alles in der Cloud speichern …';
+$labels['saveto'] = 'In der Cloud speichern …';
 $labels['saveas'] = 'Speichern als:';
 $labels['create'] = 'Erstellen';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
-$labels['fromcloud'] = 'Aus der Cloud...';
-$labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen...';
+$labels['fromcloud'] = 'Aus der Cloud …';
+$labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen …';
 $labels['attachsel'] = 'Ausgewählte anhängen';
 $labels['foldercreate'] = 'Ordner erstellen';
-$labels['folderedit'] = 'Verzeichnis ändern';
+$labels['folderedit'] = 'Ordner ändern';
+$labels['folderrename'] = 'Ordner umbenennen';
 $labels['foldermount'] = 'Speicher hinzufügen';
 $labels['folderdelete'] = 'Ordner löschen';
+$labels['folderoptions'] = 'Ordneroptionen';
 $labels['folderinside'] = 'Erstellen in';
 $labels['foldername'] = 'Ordnername';
 $labels['name'] = 'Name';
@@ -32,64 +34,119 @@ $labels['get'] = 'Herunterladen';
 $labels['getfile'] = 'Datei herunterladen';
 $labels['view'] = 'Ansehen';
 $labels['viewfile'] = 'Datei ansehen';
-$labels['rename'] = 'Datei umbenennen';
+$labels['rename'] = 'Umbenennen';
 $labels['deletefile'] = 'Datei(en) löschen';
 $labels['edit'] = 'Bearbeiten';
 $labels['editfile'] = 'Datei bearbeiten';
 $labels['save'] = 'Speichern';
 $labels['savefile'] = 'Datei speichern';
 $labels['printfile'] = 'Datei drucken';
-$labels['fileedit'] = 'Dateieigenschaften';
+$labels['renamefile'] = 'Datei umbenennen';
+$labels['createfile'] = 'Datei erstellen';
+$labels['createandedit'] = 'Erstellen und Bearbeiten';
+$labels['copyfile'] = 'Datei kopieren';
+$labels['copyandedit'] = 'Kopieren und Bearbeiten';
+$labels['documenttitle'] = 'Titel:';
+$labels['close'] = 'Schließen';
+$labels['submit'] = 'Absenden';
+$labels['confirmpassword'] = 'Passwort bestätigen';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Bilder';
 $labels['collection_document'] = 'Dokumente';
-$labels['uploading'] = 'Lade Datei(en) hoch...';
-$labels['attaching'] = 'Hänge Datei(en) an...';
-$labels['authenticating'] = 'Authentifiziere...';
-$labels['foldercreating'] = 'Erstelle Ordner...';
-$labels['folderupdating'] = 'Aktualisiere Verzeichnis...';
-$labels['foldermounting'] = 'Hinzufügen externen Speichers...';
-$labels['folderdeleting'] = 'Lösche Ordner...';
+$labels['sessions'] = 'Sitzungen';
+$labels['uploading'] = 'Datei(en) wird/werden hochgeladen …';
+$labels['attaching'] = 'Datei(en) wird/werden angehängt …';
+$labels['authenticating'] = 'Legitimierung wird durchgeführt …';
+$labels['foldercreating'] = 'Ordner wird erstellt …';
+$labels['folderupdating'] = 'Ordner wird aktualisiert …';
+$labels['foldermounting'] = 'Externer Speicher wird hinzugefügt …';
+$labels['folderdeleting'] = 'Ordner werden gelöscht …';
 $labels['folderdeleteconfirm'] = 'Sind Sie sicher, dass Sie den gewählten Ordner löschen möchten?';
 $labels['folderdeletenotice'] = 'Ordner erfolgreich gelöscht.';
-$labels['folderupdatenotice'] = 'Verzeichnis erfolgreich aktualisiert.';
+$labels['folderupdatenotice'] = 'Ordner erfolgreich aktualisiert.';
 $labels['foldercreatenotice'] = 'Ordner erfolgreich erstellt.';
 $labels['foldermountnotice'] = 'Speicher erfolgreich hinzugefügt.';
-$labels['folderauthtitle'] = 'Einloggen zu $title';
+$labels['folderauthtitle'] = 'Anmelden in $title';
 $labels['saveallnotice'] = '$n Datei(en) erfolgreich gespeichert.';
 $labels['saveallerror'] = 'Speichern von $n Datei(en) fehlgeschlagen.';
 $labels['attacherror'] = 'Anhängen von Datei(en) aus der Cloud fehlgeschlagen.';
-$labels['fileupdating'] = 'Aktualisiere Datei...';
-$labels['filemoving'] = 'Verschiebe Datei(en)...';
-$labels['filecopying'] = 'Kopiere Datei(en)...';
-$labels['filedeleting'] = 'Lösche Datei(en)...';
+$labels['fileupdating'] = 'Datei wird aktualisiert …';
+$labels['filecreating'] = 'Datei wird erstellt …';
+$labels['filemoving'] = 'Datei(en) wird/werden verschoben …';
+$labels['filecopying'] = 'Datei(en) wird/werden kopiert …';
+$labels['filedeleting'] = 'Datei(en) wird/werden gelöscht …';
 $labels['filedeleteconfirm'] = 'Sind Sie sicher, dass Sie die gewählten Dateien löschen möchten?';
 $labels['filedeletenotice'] = 'Datei(en) erfolgreich gelöscht.';
 $labels['filemovenotice'] = 'Datei(en) erfolgreich verschoben.';
 $labels['filecopynotice'] = 'Datei(en) erfolgreich kopiert.';
-$labels['uploadsizeerror'] = 'Maimale Dateigröße ($size) überschritten!';
-$labels['allfolders'] = 'suche in allen Ordnern';
+$labels['uploadsizeerror'] = 'Maximale Dateigröße ($size) überschritten!';
+$labels['listpermanent'] = 'Dauerhaft anzeigen';
+$labels['additionalfolders'] = 'Zusätzliche Ordner';
+$labels['allfolders'] = 'in allen Ordnern suchen';
 $labels['fileskip'] = 'Überspringen';
 $labels['fileskipall'] = 'Alle überspringen';
 $labels['fileoverwrite'] = 'Überschreiben';
 $labels['fileoverwriteall'] = 'Alle überschreiben';
 $labels['filemoveconfirm'] = 'Diese Aktion wird die Zieldatei <b>$file</b> überschreiben.';
+$labels['editfiledialog'] = 'Bearbeitungsaktion bestätigen';
+$labels['newsession'] = 'Neue Sitzung erstellen';
+$labels['ownedsession'] = 'Vorhandene Sitzung vortsetzen';
+$labels['invitedsession'] = 'Sitzung des Benutzers $user beitreten';
+$labels['editfilerotitle'] = 'Schreibgeschützte Datei';
+$labels['select'] = 'Auswählen';
+$labels['terminatesession'] = 'Sitzung beenden';
+$labels['sessionterminatedtitle'] = 'Sitzung beendet';
+$labels['terminate'] = 'Beenden';
+$labels['sessionterminating'] = 'Sitzung wird beendet …';
+$labels['participant'] = 'Teilnehmer';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Hinzufügen';
+$labels['delparticipant'] = 'Teilnehmer entfernen';
+$labels['invitationtextlabel'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Eingeladen';
+$labels['statusaccepted'] = 'Angenommen';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusrequested'] = 'Angefordert';
+$labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen …';
+$labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt …';
+$labels['removeparticipant'] = 'Entfernen';
+$labels['sessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['more'] = 'Mehr.';
+$labels['accept'] = 'Annehmen';
+$labels['join'] = 'Der Sitzung beitreten';
+$labels['decline'] = 'Ablehnen';
+$labels['owner'] = 'Eigentümer';
+$labels['when'] = 'Wenn';
+$labels['file'] = 'Datei';
+$labels['comment'] = 'Kommentar';
+$labels['open'] = 'Öffnen';
+$labels['invitationtitle'] = 'Einladung für $file';
+$labels['invitationaccepting'] = 'Eine Einladung wird angenommen …';
+$labels['invitationdeclining'] = 'Eine Einladung wird abgelehnt …';
+$labels['invitationrequesting'] = 'Einladung wird angefordert …';
 $labels['storepasswords'] = 'Passwort merken';
 $labels['storepasswordsdesc'] = 'Gespeicherte Passwörter werden verschlüsselt. Aktivieren Sie dies, wenn Sie nicht bei jedem Login nach dem Passwort gefragt werden möchten oder wenn dieser Speicher via WebDAV verfügbar sein soll.';
 $labels['arialabelsearchform'] = 'Suchformular für Dateien';
 $labels['arialabelquicksearchbox'] = 'Sucheingabe';
 $labels['arialabellistoptions'] = 'Dateilisten Optionen';
-$labels['arialabelfolderoptions'] = 'Ordner Aktionen';
-$labels['arialabelfileeditform'] = 'Datei Bearbeiten Maske';
-$labels['arialabelfoldercreateform'] = 'Ordner Erstellen Maske';
-$labels['arialabelfoldereditform'] = 'Formular Verzeichnis ändern';
-$labels['arialabelfoldermountform'] = 'Formular Externer Speicher';
-$labels['arialabelfolderauthform'] = 'Formular Authentifizierung Externer Speicher';
-$labels['arialabelfolderlist'] = 'Ordner / Sammlungs Auswahl';
-$labels['arialabelfileselectdialog'] = 'Datei Auswahl Dialog';
-$labels['arialabelattachmentoptions'] = 'Anhänge speichern Optionen';
-$labels['arialabelfilesavedialog'] = 'Datei(en) speichern Dialog';
+$labels['arialabelfolderoptions'] = 'Ordneraktionen';
+$labels['arialabelfileeditform'] = 'Dateibearbeitenformular';
+$labels['arialabelfilecreateform'] = 'Dateierstellenformular';
+$labels['arialabelfilelist'] = 'Dateiliste';
+$labels['arialabelfoldercreateform'] = 'Ordnererstellenformular';
+$labels['arialabelfoldereditform'] = 'Ordnerbearbeitenformular';
+$labels['arialabelfoldermountform'] = 'Externer-Speicherformular';
+$labels['arialabelfolderauthform'] = 'Legitimierungsformular des externen Speichers';
+$labels['arialabelfolderlist'] = 'Ordner-/Sammelauswahl';
+$labels['arialabelfileselectdialog'] = 'Dateiauswahldialog';
+$labels['arialabelattachmentoptions'] = 'Anhängespeichernoptionen';
+$labels['arialabelfilesavedialog'] = 'Datei(en)speicherndialog';
 $labels['arialabelfileprops'] = 'Dateieigenschaften';
-$labels['arialabelfilecontent'] = 'Datei Inhalt';
-?>
+$labels['arialabelfilecontent'] = 'Dateiinhalt';
+$labels['arialabelfileeditdialog'] = 'Dateibearbeitungsdialog';
+$labels['arialabelfilesessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['type.plain'] = 'Klartextdokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';
+$labels['type.html'] = 'HTML-Dokument';
diff --git a/plugins/kolab_files/localization/el.inc b/plugins/kolab_files/localization/el.inc
new file mode 100644
index 00000000..074820fd
--- /dev/null
+++ b/plugins/kolab_files/localization/el.inc
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'Αρχεία';
+$labels['filepreview'] = 'Προεπισκόπηση αρχείου';
+$labels['saveall'] = 'Αποθήκευση όλων στο cloud...';
+$labels['saveto'] = 'Αποθήκευση στο cloud...';
+$labels['saveas'] = 'Αποθήκευση ως:';
+$labels['create'] = 'Δημιουργία';
+$labels['save'] = 'Αποθήκευση';
+$labels['cancel'] = 'Άκυρο';
+$labels['fromcloud'] = 'Από το cloud...';
+$labels['attachsel'] = 'Επισύναψη επιλεγμένου';
+$labels['foldercreate'] = 'Δημιουργία φακέλου';
+$labels['folderedit'] = 'Επεξεργασία φακέλου';
+$labels['foldermount'] = 'Προσθήκη αποθηκευτικού χώρου';
+$labels['folderdelete'] = 'Διαγραφή φακέλου';
+$labels['foldername'] = 'Όνομα φακέλου';
+$labels['name'] = 'Όνομα';
+$labels['type'] = 'Τύπος';
+$labels['upload'] = 'Μεταφόρτωση';
+$labels['uploadfile'] = 'Μεταφόρτωση αρχείου(ων)';
+$labels['get'] = 'Λήψη';
+$labels['getfile'] = 'Λήψη αρχείου';
+$labels['view'] = 'Προβολή';
+$labels['viewfile'] = 'Προβολή αρχείου';
+$labels['rename'] = 'Μετονομασία';
+$labels['deletefile'] = 'Διαγραφή αρχείου(ων)';
+$labels['edit'] = 'Επεξεργασία';
+$labels['editfile'] = 'Επεξεργασία αρχείου';
+$labels['save'] = 'Αποθήκευση';
+$labels['savefile'] = 'Αποθήκευση αρχείου';
+$labels['printfile'] = 'Εκτύπωση αρχείου';
+$labels['renamefile'] = 'Μετονομασία αρχείου';
+$labels['createfile'] = 'Δημιουργία αρχείου';
+$labels['createandedit'] = 'Δημιουργία και επεξεργασία';
+$labels['copyfile'] = 'Αντιγραφή αρχείου';
+$labels['copyandedit'] = 'Αντιγραφή και επεξεργασία';
+$labels['documenttitle'] = 'Τίτλος:';
+$labels['close'] = 'Κλείσιμο';
+$labels['submit'] = 'Υποβολή';
+$labels['collection_audio'] = 'Ήχος';
+$labels['collection_video'] = 'Βίντεο';
+$labels['collection_image'] = 'Εικόνες';
+$labels['collection_document'] = 'Έγγραφα';
+$labels['foldercreating'] = 'Γίνεται δημιουργία φακέλου...';
+$labels['folderupdating'] = 'Γίνεται ενημέρωση φακέλου...';
+$labels['foldermounting'] = 'Προσθήκη εξωτερικού αποθηκευτικού χώρου...';
+$labels['folderdeleting'] = 'Γίνεται διαγραφή φακέλου...';
+$labels['fileupdating'] = 'Γίνεται ενημέρωση αρχείου...';
+$labels['filecreating'] = 'Γίνεται δημιουργία αρχείου...';
+$labels['filemoving'] = 'Μετακίνηση αρχείου(ων)...';
+$labels['filecopying'] = 'Αντιγραφή αρχείου(ων)...';
+$labels['filedeleting'] = 'Διαγραφή αρχείου(ων)...';
+$labels['filedeleteconfirm'] = 'Θέλετε να διαγράψετε τα επιλεγμένα αρχεία;';
+$labels['fileoverwrite'] = 'Αντικατάσταση';
+$labels['fileoverwriteall'] = 'Αντικατάσταση όλων';
+$labels['select'] = 'Επιλογή';
+$labels['status'] = 'Κατάσταση';
+$labels['addparticipant'] = 'Προσθήκη συμμετεχόντων';
+$labels['statusorganizer'] = 'Οργανωτής';
+$labels['removeparticipant'] = 'Αφαίρεση';
+$labels['file'] = 'Αρχείο';
+$labels['comment'] = 'Σχόλιο';
+$labels['open'] = 'Άνοιγμα';
+$labels['request'] = 'Αίτηση πρόσκλησης';
+$labels['arialabelfilelist'] = 'Λίστα αρχείων';
+$labels['arialabelfileprops'] = 'Ιδιότητες αρχείου';
+$labels['arialabelfilecontent'] = 'Περιεχόμενο αρχείου';
+$labels['type.vndoasisopendocumenttext'] = 'Αρχείο κειμένου (ODF)';
+$labels['type.html'] = 'Έγγραφο HTML';
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 5c131e1c..4edb2666 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -20,9 +20,16 @@ $labels['fromcloud'] = 'From cloud...';
 $labels['selectfiles'] = 'Select file(s) to attach...';
 $labels['attachsel'] = 'Attach selected';
 $labels['foldercreate'] = 'Create folder';
+$labels['addfolder'] = 'Add folder';
+$labels['foldershare'] = 'Share folder';
 $labels['folderedit'] = 'Edit folder';
+$labels['folderrename'] = 'Rename folder';
 $labels['foldermount'] = 'Add storage';
 $labels['folderdelete'] = 'Delete folder';
+$labels['folderoptions'] = 'Folder options';
+$labels['findfolders'] = 'Find folders...';
+$labels['findfiles'] = 'Find files';
+$labels['share'] = 'Share';
 
 $labels['folderinside'] = 'Insert inside';
 $labels['foldername'] = 'Folder name';
@@ -50,6 +57,10 @@ $labels['copyfile'] = 'Copy a file';
 $labels['copyandedit'] = 'Copy and Edit';
 $labels['documenttitle'] = 'Title:';
 $labels['close'] = 'Close';
+$labels['docedit'] = 'Document editing';
+$labels['submit'] = 'Submit';
+$labels['confirmpassword'] = 'Confirm password';
+$labels['passwordconflict'] = 'Passwords do not match';
 
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
@@ -83,6 +94,9 @@ $labels['filedeletenotice'] = 'File(s) deleted successfully.';
 $labels['filemovenotice'] = 'File(s) moved successfully.';
 $labels['filecopynotice'] = 'File(s) copied successfully.';
 $labels['uploadsizeerror'] = 'Maximum file size ($size) exceeded!';
+$labels['updatingfoldershares'] = 'Updating folder permissions...';
+$labels['updatingfolderupload-link'] = 'Updating upload link...';
+$labels['updatingfolderdownload-link'] = 'Updating download link...';
 
 $labels['listpermanent'] = 'List permanently';
 $labels['additionalfolders'] = 'Additional folders';
@@ -143,12 +157,15 @@ $labels['comment'] = 'Comment';
 $labels['open'] = 'Open';
 $labels['request'] = 'Request an invitation';
 $labels['invitationtitle'] = 'Invitation for $file';
-$labels['ivitationaccepting'] = 'Accepting an invitation...';
-$labels['ivitationdeclining'] = 'Declining an invitation...';
-$labels['ivitationrequesting'] = 'Requesting an invitation...';
+$labels['invitationaccepting'] = 'Accepting an invitation...';
+$labels['invitationdeclining'] = 'Declining an invitation...';
+$labels['invitationrequesting'] = 'Requesting an invitation...';
 
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
+$labels['storageautherror'] = 'Authentication failed for $title storage.';
+$labels['sharepermissionerror'] = 'You do not have permission to manage this folder sharing.';
+$labels['sharestorageerror'] = 'Failed to get folder sharing information.';
 
 $labels['arialabelsearchform'] = 'Files search form';
 $labels['arialabelquicksearchbox'] = 'Search input';
@@ -168,6 +185,14 @@ $labels['arialabelfilesavedialog'] = 'File(s) saving dialog';
 $labels['arialabelfileprops'] = 'File properties';
 $labels['arialabelfilecontent'] = 'File content';
 $labels['arialabelfileeditdialog'] = 'File editing dialog';
+$labels['arialabelsessionslist'] = 'List of document editing sessions';
+$labels['arialabelsessionslistoptions'] = 'Sessions list options';
+$labels['arialabelfilerenameform'] = 'File rename form';
+$labels['arialabelfilesessiondialog'] = 'Document editing session';
+$labels['arialabelcollaborators'] = 'List of document editors';
+$labels['arialabelexportoptions'] = 'Export options';
+$labels['arialabeldoceditorsdialog'] = 'Document editors (invitations)';
+$labels['arialabelmorefileactions'] = 'More file actions';
 
 $labels['type.plain'] = 'Plain Text Document';
 $labels['type.vndoasisopendocumenttext'] = 'Text Document (ODF)';
diff --git a/plugins/kolab_files/localization/es_AR.inc b/plugins/kolab_files/localization/es_AR.inc
index 2f5be665..268fb44e 100644
--- a/plugins/kolab_files/localization/es_AR.inc
+++ b/plugins/kolab_files/localization/es_AR.inc
@@ -18,7 +18,15 @@ $labels['fromcloud'] = 'De la nube...';
 $labels['selectfiles'] = 'Seleccionar archivo(s) para adjuntar...';
 $labels['attachsel'] = 'Adjunto seleccionado';
 $labels['foldercreate'] = 'Crear carpeta';
+$labels['addfolder'] = 'Agregar carpeta';
+$labels['foldershare'] = 'Compartir carpeta';
+$labels['folderedit'] = 'Editar carpeta';
+$labels['folderrename'] = 'Renombrar carpeta';
+$labels['foldermount'] = 'Agregar almacenamiento';
 $labels['folderdelete'] = 'Eliminar carpeta';
+$labels['folderoptions'] = 'Opciones de carpeta';
+$labels['findfiles'] = 'Encontrar archivos';
+$labels['share'] = 'Compartir';
 $labels['folderinside'] = 'Insertar dentro';
 $labels['foldername'] = 'Nombre de carpeta';
 $labels['name'] = 'Nombre';
@@ -30,29 +38,47 @@ $labels['get'] = 'Descargar';
 $labels['getfile'] = 'Descargar archivo';
 $labels['view'] = 'Ver';
 $labels['viewfile'] = 'Ver archivo';
-$labels['rename'] = 'Renombrar archivo';
+$labels['rename'] = 'Renombrar';
 $labels['deletefile'] = 'Eliminar archivo(s)';
 $labels['edit'] = 'Editar';
 $labels['editfile'] = 'Editar archivo';
 $labels['save'] = 'Guardar';
 $labels['savefile'] = 'Guardar archivo';
 $labels['printfile'] = 'Imprimir archivo';
-$labels['fileedit'] = 'Propiedades del archivo';
+$labels['renamefile'] = 'Renombrar un archivo';
+$labels['createfile'] = 'Crear un archivo';
+$labels['createandedit'] = 'Crear y Editar';
+$labels['copyfile'] = 'Copiar un archivo';
+$labels['copyandedit'] = 'Copiar y Editar';
+$labels['documenttitle'] = 'Título:';
+$labels['close'] = 'Cerrar';
+$labels['docedit'] = 'Edición del documento';
+$labels['submit'] = 'Enviar';
+$labels['confirmpassword'] = 'Confirmar contraseña';
+$labels['passwordconflict'] = 'Las contraseñas no coinciden';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Vídeo';
 $labels['collection_image'] = 'Imágenes';
 $labels['collection_document'] = 'Documentos';
+$labels['sessions'] = 'Sesiones';
 $labels['uploading'] = 'Subiendo archivo(s)...';
 $labels['attaching'] = 'Adjuntando archivo(s)...';
+$labels['authenticating'] = 'Autenticando...';
 $labels['foldercreating'] = 'Creando carpeta...';
+$labels['folderupdating'] = 'Actualizando carpeta...';
+$labels['foldermounting'] = 'Agregando almacenamiento externo...';
 $labels['folderdeleting'] = 'Eliminando carpeta...';
 $labels['folderdeleteconfirm'] = 'Confirme que desea eliminar la carpeta seleccionada';
 $labels['folderdeletenotice'] = 'La carpeta fue eliminada exitosamente.';
+$labels['folderupdatenotice'] = 'Carpeta actualizada exitosamente.';
 $labels['foldercreatenotice'] = 'La carpeta fue creada exitosamente.';
+$labels['foldermountnotice'] = 'Almacenamiento agregado exitosamente.';
+$labels['folderauthtitle'] = 'Ingresar a $title';
 $labels['saveallnotice'] = 'Se guardaron $n archivo(s) exitosamente.';
 $labels['saveallerror'] = 'Fallo guardando $n archivos.';
 $labels['attacherror'] = 'Fallo adjuntando archivo(s) de la nube';
 $labels['fileupdating'] = 'Actualizando archivo...';
+$labels['filecreating'] = 'Creando archivo...';
 $labels['filemoving'] = 'Moviendo archivo(s)...';
 $labels['filecopying'] = 'Copiando archivo(s)...';
 $labels['filedeleting'] = 'Eliminando archivo(s)...';
@@ -61,22 +87,101 @@ $labels['filedeletenotice'] = 'Archivo(s) eliminados exitosamente.';
 $labels['filemovenotice'] = 'Archivo(s) movidos exitosamente.';
 $labels['filecopynotice'] = 'Archivo(s) copiados exitosamente.';
 $labels['uploadsizeerror'] = 'Ha excedido el tamaño máximo de archivo ($size)';
+$labels['updatingfoldershares'] = 'Actualizando permisos de carpetas...';
+$labels['updatingfolderupload-link'] = 'Actualizando el enlace de subida...';
+$labels['updatingfolderdownload-link'] = 'Actualizando el enlace de descarga...';
+$labels['listpermanent'] = 'Listar permanentemente';
+$labels['additionalfolders'] = 'Carpetas adicionales';
 $labels['allfolders'] = 'buscar en todas las carpetas';
 $labels['fileskip'] = 'Omitir';
 $labels['fileskipall'] = 'Omitir todo';
 $labels['fileoverwrite'] = 'Sobreescribir';
 $labels['fileoverwriteall'] = 'Sobreescribir todo';
 $labels['filemoveconfirm'] = 'Esta acción sobreescribirá el archivo de destino: <b>$file</b>';
+$labels['editfiledialog'] = 'Confirmar la acción de edición';
+$labels['editfilesessions'] = 'Hay sesiones activas para el archivo seleccionado. Por favor, seleccione la acción que quiere realizar.';
+$labels['newsession'] = 'Crear una nueva sesión';
+$labels['newsessionro'] = 'Crear una nueva sesión (copiar el archivo en una ubicación de sólo lectura)';
+$labels['ownedsession'] = 'Continuar con la sesión existente';
+$labels['invitedsession'] = 'Unirse a la sesión de $user';
+$labels['joinsession'] = 'Requerir una invitación de $user';
+$labels['editfilero'] = 'Este archivo es de sólo lectura. Confirme que quiere crear y editar una copia del archivo.';
+$labels['editfilerotitle'] = 'Archivo de sólo lectura';
+$labels['select'] = 'Seleccionar';
+$labels['terminatesession'] = 'Terminar la sesión';
+$labels['sessionterminatedtitle'] = 'Sesión terminada';
+$labels['sessionterminated'] = 'La sesión ha sido terminada. La ventana será cerrada.';
+$labels['terminate'] = 'Terminar';
+$labels['sessionterminating'] = 'Terminando la sesión...';
+$labels['unsavedchanges'] = 'Hay cambios sin guardad en el documento que serán perdidos. ¿Desea terminar la sesión de todos modos?';
+$labels['manageeditors'] = 'Invitar al documento';
+$labels['participant'] = 'Participante';
+$labels['status'] = 'Estado';
+$labels['addparticipant'] = 'Agregar participante';
+$labels['delparticipant'] = 'Remover participante';
+$labels['invitationtexttitle'] = 'Este comentario será adjuntado al mensaje de invitación/notificación enviado al participante';
+$labels['invitationtextlabel'] = 'Comentario de la invitación/notificación';
+$labels['statusorganizer'] = 'Organizador';
+$labels['statusinvited'] = 'Invitado';
+$labels['statusaccepted'] = 'Aceptado';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusrequested'] = 'Requerido';
+$labels['documentinviting'] = 'Invitando participante(s)...';
+$labels['documentcancelling'] = 'Removiendo participante(s)...';
+$labels['removeparticipant'] = 'Elminiar';
+$labels['invitednotice'] = 'Ha sido invitado a la sesión de edición por $owner.';
+$labels['acceptedownernotice'] = '$owner ha aceptado su requerimiento de unirse a la sesión de edición.';
+$labels['declinedownernotice'] = '$owner rechazó su requerimiento de unirse a la sesión de edición.';
+$labels['acceptednotice'] = '$user ha aceptado su invitación a la sesión de edición.';
+$labels['declinednotice'] = '$user rechazó su invitación a la sesión de edición.';
+$labels['requestednotice'] = '$user ha requerido unirse a la sesión de edición.';
+$labels['sessiondialog'] = 'Sesión de edición del documento';
+$labels['sessiondialogcontent'] = 'Hay una sesión de edición de $file creada por $owner.';
+$labels['more'] = 'Más.';
+$labels['accept'] = 'Aceptar';
+$labels['join'] = 'Unirse a la sesión';
+$labels['decline'] = 'Rechazar';
+$labels['owner'] = 'Propietario';
+$labels['when'] = 'Cuando';
+$labels['file'] = 'Archivo';
+$labels['comment'] = 'Comentario';
+$labels['open'] = 'Abrir';
+$labels['request'] = 'Requerir una invitación';
+$labels['invitationtitle'] = 'Invitación para $file';
+$labels['invitationaccepting'] = 'Aceptando una invitación...';
+$labels['invitationdeclining'] = 'Rechazando una invitación...';
+$labels['invitationrequesting'] = 'Requiriendo una invitación...';
+$labels['storepasswords'] = 'recordar contraseña';
+$labels['storepasswordsdesc'] = 'Las contraseñas almacenadas serán encriptadas. Habilite esto si no desea que se le pida su contraseña con cada ingreso o si quiere que este almacenamiento esté disponible vía WebDAV.';
+$labels['storageautherror'] = 'Falló la autenticación para el almacenamiento $title';
+$labels['sharepermissionerror'] = 'No tiene permiso para administrar esta carpeta compartida.';
+$labels['sharestorageerror'] = 'Fallo al obtener la información de la carpeta compartida.';
 $labels['arialabelsearchform'] = 'Formulario de búsqueda de archivos';
 $labels['arialabelquicksearchbox'] = 'Entrada de búsqueda';
 $labels['arialabellistoptions'] = 'Opciones de lista de archivos';
 $labels['arialabelfolderoptions'] = 'Acciones de carpeta';
 $labels['arialabelfileeditform'] = 'Formulario de edición de archivo';
+$labels['arialabelfilecreateform'] = 'Formulario de creación de archivo';
+$labels['arialabelfilelist'] = 'Lista de archivos';
 $labels['arialabelfoldercreateform'] = 'Formulario de creación de carpeta';
+$labels['arialabelfoldereditform'] = 'Formulario de edición de carpeta';
+$labels['arialabelfoldermountform'] = 'Formulario de almacenamiento externo';
+$labels['arialabelfolderauthform'] = 'Formulario de autenticación de almacenamiento externo';
 $labels['arialabelfolderlist'] = 'Selección de carpeta/colección';
 $labels['arialabelfileselectdialog'] = 'Diálogo de selección de archivo';
 $labels['arialabelattachmentoptions'] = 'Opciones para guardar adjunto';
 $labels['arialabelfilesavedialog'] = 'Diálogo de guardado de archivo(s)';
 $labels['arialabelfileprops'] = 'Propiedades del archivo';
 $labels['arialabelfilecontent'] = 'Contenido del archivo';
-?>
+$labels['arialabelfileeditdialog'] = 'Dialogo de edición de archivo';
+$labels['arialabelsessionslist'] = 'Lista de sesiones de edición de documento';
+$labels['arialabelsessionslistoptions'] = 'Opciones de la lista de sesiones';
+$labels['arialabelfilerenameform'] = 'Formulario de renombrado de archivo';
+$labels['arialabelfilesessiondialog'] = 'Sesión de edición del documento';
+$labels['arialabelcollaborators'] = 'Lista de editores de documento';
+$labels['arialabelexportoptions'] = 'Opciones de exportación';
+$labels['arialabeldoceditorsdialog'] = 'Editores del documento (invitaciones)';
+$labels['arialabelmorefileactions'] = 'Más acciones de archivo';
+$labels['type.plain'] = 'Documento de Texto Plano';
+$labels['type.vndoasisopendocumenttext'] = 'Documento de Texto (ODF)';
+$labels['type.html'] = 'Documento HTML';
diff --git a/plugins/kolab_files/localization/es_ES.inc b/plugins/kolab_files/localization/es_ES.inc
index c03116bb..d80453c5 100644
--- a/plugins/kolab_files/localization/es_ES.inc
+++ b/plugins/kolab_files/localization/es_ES.inc
@@ -6,10 +6,164 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
+$labels['files'] = 'Archivos';
+$labels['filepreview'] = 'Vista previa del archivo';
+$labels['saveall'] = 'guardar todos en la nube...';
+$labels['saveto'] = 'guardar en la nube...';
+$labels['saveas'] = 'Guardar como:';
+$labels['create'] = 'Crear';
 $labels['save'] = 'Guardar';
 $labels['cancel'] = 'Cancelar';
+$labels['fromcloud'] = 'Desde la nube...';
+$labels['selectfiles'] = 'Seleccione los archivos que desea adjuntar...';
+$labels['attachsel'] = 'Adjuntos seleccionados';
+$labels['foldercreate'] = 'Crear carpeta';
+$labels['addfolder'] = 'Añadir carpeta';
+$labels['folderedit'] = 'Editar carpeta';
+$labels['foldermount'] = 'Añadir almacenamiento';
+$labels['folderdelete'] = 'Borrar carpeta';
+$labels['folderoptions'] = 'Opciones de carpeta';
+$labels['findfiles'] = 'Buscar archivos';
+$labels['folderinside'] = 'Inserte en el interior';
+$labels['foldername'] = 'Nombre de la carpeta';
 $labels['name'] = 'Nombre';
+$labels['mtime'] = 'Modificado';
 $labels['type'] = 'Tipo';
+$labels['upload'] = 'Cargar';
+$labels['uploadfile'] = 'Cargar archivo(s)';
+$labels['get'] = 'Descargar';
+$labels['getfile'] = 'Descargar archivo';
+$labels['view'] = 'Vista';
+$labels['viewfile'] = 'Ver archivo';
+$labels['rename'] = 'Renombrar';
+$labels['deletefile'] = 'Eliminar archivo(s)';
 $labels['edit'] = 'Editar';
+$labels['editfile'] = 'Editar archivo';
 $labels['save'] = 'Guardar';
-?>
+$labels['savefile'] = 'Guardar archivo';
+$labels['printfile'] = 'Imprimir archivo';
+$labels['renamefile'] = 'Renombrar un archivo';
+$labels['createfile'] = 'Crear un archivo';
+$labels['createandedit'] = 'Crear y editar';
+$labels['copyfile'] = 'Copiar un archivo';
+$labels['copyandedit'] = 'Copiar y editar';
+$labels['documenttitle'] = 'Título:';
+$labels['close'] = 'Cerrar';
+$labels['submit'] = 'Enviar';
+$labels['confirmpassword'] = 'Confirmar contraseña';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Vídeo';
+$labels['collection_image'] = 'Imágenes';
+$labels['collection_document'] = 'Documentos';
+$labels['sessions'] = 'Sesiones';
+$labels['uploading'] = 'Cargando archivo(s)...';
+$labels['attaching'] = 'Adjuntando archivo(s)...';
+$labels['authenticating'] = 'Validando...';
+$labels['foldercreating'] = 'Creando carpeta...';
+$labels['folderupdating'] = 'Actualizando carpeta...';
+$labels['foldermounting'] = 'Añadiendo almacenamiento externo...';
+$labels['folderdeleting'] = 'Borrando carpeta...';
+$labels['folderdeleteconfirm'] = '¿Está seguro de que quiere borrar la carpeta seleccionada?';
+$labels['folderdeletenotice'] = 'La carpeta se ha borrado con éxito.';
+$labels['folderupdatenotice'] = 'La carpeta se ha actualizado con éxito.';
+$labels['foldercreatenotice'] = 'La carpeta se ha creado con éxito.';
+$labels['foldermountnotice'] = 'El almacenamiento se ha añadido con éxito.';
+$labels['folderauthtitle'] = 'Iniciar sesión en $title';
+$labels['saveallnotice'] = 'Los archivos $n se han guardado correctamente.';
+$labels['saveallerror'] = 'Los archivos $n no se han guardado correctamente.';
+$labels['attacherror'] = 'Error al adjuntar los archivos de la nube';
+$labels['fileupdating'] = 'Actualizando el archivo...';
+$labels['filecreating'] = 'Creando el archivo...';
+$labels['filemoving'] = 'Moviendo los archivos...';
+$labels['filecopying'] = 'Copiando los archivos...';
+$labels['filedeleting'] = 'Borrando los archivos...';
+$labels['filedeleteconfirm'] = '¿Está seguro de que quiere borrar los archivos seleccionados?';
+$labels['filedeletenotice'] = 'Los archivos se han borrado correctamente.';
+$labels['filemovenotice'] = 'Los archivos se han movido correctamente.';
+$labels['filecopynotice'] = 'Los archivos se han copiado correctamente.';
+$labels['uploadsizeerror'] = 'Se ha excedido el tamaño ($size) máximo del archivo';
+$labels['listpermanent'] = 'Lista Permanente';
+$labels['additionalfolders'] = 'Carpetas adicionales';
+$labels['allfolders'] = 'buscar en todas las carpetas';
+$labels['fileskip'] = 'Saltar';
+$labels['fileskipall'] = 'Saltar todas';
+$labels['fileoverwrite'] = 'Sobrescribir';
+$labels['fileoverwriteall'] = 'Sobrescribir todas';
+$labels['filemoveconfirm'] = 'Esta acción va a sobrescribir el archivo de destino: <b>$file</b>.';
+$labels['editfiledialog'] = 'Confirmar acción de edición';
+$labels['editfilesessions'] = 'Hay sesiones en curso en el archivo seleccionado. Por favor, seleccione la acción que desea emprender.';
+$labels['newsession'] = 'Crear una sesión nueva';
+$labels['newsessionro'] = 'Crear una nueva sesión (copiar el archivo en la ubicación de lectura-escritura)';
+$labels['ownedsession'] = 'Continuar la sesión existente';
+$labels['invitedsession'] = 'Unirse a la sesión de $user';
+$labels['joinsession'] = 'Solicitar una invitación de $user';
+$labels['editfilero'] = 'Este archivo es de sólo lectura. ¿Desea crear y editar una copia del archivo?';
+$labels['editfilerotitle'] = 'Archivo de sólo lectura';
+$labels['select'] = 'Seleccionar';
+$labels['terminatesession'] = 'Finalizar sesión';
+$labels['sessionterminatedtitle'] = 'Sesión finalizada';
+$labels['sessionterminated'] = 'La sesión ha finalizado. Se cerrará la ventana.';
+$labels['terminate'] = 'Finalizar';
+$labels['sessionterminating'] = 'Finalizar la sesión...';
+$labels['unsavedchanges'] = 'Hay cambios no guardados en el documento que se perderán. ¿Quieres finalizar la sesión de todos modos?';
+$labels['manageeditors'] = 'Invitar al documento';
+$labels['participant'] = 'Participante';
+$labels['status'] = 'Estado';
+$labels['addparticipant'] = 'Añada participante';
+$labels['delparticipant'] = 'Eliminar participante';
+$labels['invitationtexttitle'] = 'Este comentario se adjuntará al mensaje de invitación/notificación enviado al participante';
+$labels['invitationtextlabel'] = 'Añadir comentarios a la Invitación/notificación';
+$labels['statusorganizer'] = 'Organizador';
+$labels['statusinvited'] = 'Invitado';
+$labels['statusaccepted'] = 'Aceptada';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusrequested'] = 'Solicitado';
+$labels['documentinviting'] = 'Invitando participante(s)...';
+$labels['documentcancelling'] = 'Eliminando participante(s)';
+$labels['removeparticipant'] = 'Eliminar';
+$labels['invitednotice'] = 'Ha sido invitado para la sesión de edición por $owner.';
+$labels['acceptedownernotice'] = '$owner aceptó su solicitud para unirse a la sesión de edición.';
+$labels['declinedownernotice'] = '$owner rechazó su solicitud para unirse a la sesión de edición.';
+$labels['acceptednotice'] = '$user aceptó su solicitud para la sesión de edición.';
+$labels['declinednotice'] = '$user rechazó su solicitud para la sesión de edición.';
+$labels['requestednotice'] = '$user solicitó unirse a la sesión de edición.';
+$labels['sessiondialog'] = 'Sesión de edición del documento';
+$labels['sessiondialogcontent'] = 'Hay una sesión de edición en curso en $file creada por $owner.';
+$labels['more'] = 'Mas.';
+$labels['accept'] = 'Aceptar';
+$labels['join'] = 'Unirse a la sesión';
+$labels['decline'] = 'Declinar';
+$labels['owner'] = 'Propietario';
+$labels['when'] = 'Cuándo';
+$labels['file'] = 'archivo';
+$labels['comment'] = 'Comentario';
+$labels['open'] = 'Abrir';
+$labels['request'] = 'Solicitar una invitación';
+$labels['invitationtitle'] = 'Invitación para $file';
+$labels['invitationaccepting'] = 'Aceptar una invitación...';
+$labels['invitationdeclining'] = 'Declinar una invitación...';
+$labels['invitationrequesting'] = 'Solicitar una invitación...';
+$labels['storepasswords'] = 'recordar contraseña';
+$labels['storepasswordsdesc'] = 'Las contraseñas almacenadas se cifrarán. Actívelas si no desea que se le solicite la contraseña en cada inicio de sesión o si desea que este almacenamiento esté disponible a través de WebDAV.';
+$labels['arialabelsearchform'] = 'Formulario de búsqueda de archivos';
+$labels['arialabelquicksearchbox'] = 'Buscar entrada';
+$labels['arialabellistoptions'] = 'Opciones de la lista de archivos';
+$labels['arialabelfolderoptions'] = 'Acciones de carpeta';
+$labels['arialabelfileeditform'] = 'Formulario de edición del archivo';
+$labels['arialabelfilecreateform'] = 'Formulario de creación del archivo';
+$labels['arialabelfilelist'] = 'Lista de archivos';
+$labels['arialabelfoldercreateform'] = 'Formulario de creación del archivo';
+$labels['arialabelfoldereditform'] = 'Formulario de edición de la carpeta';
+$labels['arialabelfoldermountform'] = 'Formulario de almacenamiento externo';
+$labels['arialabelfolderauthform'] = 'Formulario de validación de almacenamiento externo';
+$labels['arialabelfolderlist'] = 'Selección de colección o carpeta';
+$labels['arialabelfileselectdialog'] = 'Diálogo de selección de archivo';
+$labels['arialabelattachmentoptions'] = 'Opciones de guardar documentos adjuntos';
+$labels['arialabelfilesavedialog'] = 'Diálogo de guardar archivo(s)';
+$labels['arialabelfileprops'] = 'Propiedades del archivo';
+$labels['arialabelfilecontent'] = 'Contenido del archivo';
+$labels['arialabelfileeditdialog'] = 'Diálogo de edición de archivo';
+$labels['arialabelfilesessiondialog'] = 'Sesión de edición del documento';
+$labels['type.plain'] = 'Documento de texto sin formato';
+$labels['type.vndoasisopendocumenttext'] = 'Documento de texto (ODF)';
+$labels['type.html'] = 'Documento HTML';
diff --git a/plugins/kolab_files/localization/et_EE.inc b/plugins/kolab_files/localization/et_EE.inc
index fa39b156..ac6c6d92 100644
--- a/plugins/kolab_files/localization/et_EE.inc
+++ b/plugins/kolab_files/localization/et_EE.inc
@@ -6,7 +6,105 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
+$labels['files'] = 'Failid';
+$labels['filepreview'] = 'Faili eelvaade';
+$labels['saveall'] = 'Salvesta kõik pilve...';
+$labels['saveto'] = 'Salvesta pilve...';
+$labels['saveas'] = 'Salvesta kui:';
+$labels['create'] = 'Loo';
 $labels['save'] = 'Salvesta';
+$labels['cancel'] = 'Loobu';
+$labels['fromcloud'] = 'Pilvest...';
+$labels['foldercreate'] = 'Loo kaust';
+$labels['addfolder'] = 'Lisa kaust';
+$labels['folderedit'] = 'Muuda kausta';
+$labels['foldermount'] = 'Lisa salvestuskoht';
+$labels['folderdelete'] = 'Kustuta kaust';
+$labels['folderoptions'] = 'Kausta valikud';
+$labels['findfiles'] = 'Otsi faile';
+$labels['folderinside'] = 'Sisesta';
+$labels['foldername'] = 'Kausta nimi';
 $labels['name'] = 'Nimi';
+$labels['mtime'] = 'Muudetud';
+$labels['type'] = 'Liik';
+$labels['upload'] = 'Laadi üles';
+$labels['get'] = 'Laadi alla';
+$labels['getfile'] = 'aadi fail alla';
+$labels['view'] = 'Vaade';
+$labels['viewfile'] = 'Vaata faili';
+$labels['rename'] = 'Nimeta ümber';
+$labels['edit'] = 'Muuda';
+$labels['editfile'] = 'Muuda faili';
 $labels['save'] = 'Salvesta';
-?>
+$labels['savefile'] = 'Salvesta fail';
+$labels['printfile'] = 'Prindi fail';
+$labels['renamefile'] = 'Nimeta fail ümber';
+$labels['createfile'] = 'Loo fail';
+$labels['createandedit'] = 'Loo ja muuda';
+$labels['copyfile'] = 'Kopeeri fail';
+$labels['copyandedit'] = 'Kopeeri ja muuda';
+$labels['documenttitle'] = 'Pealkiri:';
+$labels['close'] = 'Sulge';
+$labels['docedit'] = 'Dokumendi muutmine';
+$labels['submit'] = 'Saada';
+$labels['confirmpassword'] = 'Kinnita parool';
+$labels['collection_audio'] = 'Heli';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Pildid';
+$labels['collection_document'] = 'Dokumendid';
+$labels['sessions'] = 'Sessioonid';
+$labels['authenticating'] = 'Autentimine...';
+$labels['foldercreating'] = 'Kaustade loomine...';
+$labels['folderupdating'] = 'Kaustade üleslaadimine...';
+$labels['folderdeleting'] = 'Kausta kustutamine...';
+$labels['folderdeletenotice'] = 'Kaust on kustutatud.';
+$labels['folderupdatenotice'] = 'Kaust on uuendatud.';
+$labels['foldercreatenotice'] = 'Kaust on loodud.';
+$labels['fileupdating'] = 'Faili uuendamine...';
+$labels['filecreating'] = 'Faili loomine...';
+$labels['filemoving'] = 'Faili(de) liigutamine...';
+$labels['filecopying'] = 'Faili(de) kopeerimine...';
+$labels['filedeleting'] = 'Faili(de) kustutamine...';
+$labels['additionalfolders'] = 'Lisakaustad';
+$labels['allfolders'] = 'otsi kõikidest kaustadest';
+$labels['fileskip'] = 'Jäta vahele';
+$labels['fileskipall'] = 'Jäta kõik vahele';
+$labels['fileoverwrite'] = 'Kirjuta üles';
+$labels['fileoverwriteall'] = 'Kirjuta kõik üle';
+$labels['newsession'] = 'Loo uus sessioon';
+$labels['editfilerotitle'] = 'Kirjutuskaitstud fail';
+$labels['select'] = 'Vali';
+$labels['terminatesession'] = 'Peata sessioon';
+$labels['sessionterminatedtitle'] = 'Sessioon on peatatud';
+$labels['terminate'] = 'Peata';
+$labels['participant'] = 'Osaleja';
+$labels['status'] = 'Staatus';
+$labels['addparticipant'] = 'Lisa osaleja';
+$labels['statusorganizer'] = 'Organiseerija';
+$labels['statusinvited'] = 'Kutsutud';
+$labels['statusaccepted'] = 'Vastu võetud';
+$labels['statusdeclined'] = 'Tagasi lükatud';
+$labels['statusrequested'] = 'Küsitud';
+$labels['removeparticipant'] = 'Eemalda';
+$labels['more'] = 'Veel.';
+$labels['accept'] = 'Võta vastu';
+$labels['join'] = 'Liitu sessiooniga';
+$labels['decline'] = 'Lükka tagasi';
+$labels['owner'] = 'Omanik';
+$labels['when'] = 'Millal';
+$labels['file'] = 'Fail';
+$labels['comment'] = 'Kommentaar';
+$labels['open'] = 'Ava';
+$labels['request'] = 'Küsi kutset';
+$labels['invitationaccepting'] = 'Kutse vastuvõtmine...';
+$labels['invitationdeclining'] = 'Kutse tagasilükkamine...';
+$labels['invitationrequesting'] = 'Kutse küsimine...';
+$labels['storepasswords'] = 'jäta parool meelde';
+$labels['arialabelfileprops'] = 'Faili omadused';
+$labels['arialabelfilecontent'] = 'Faili sisu';
+$labels['arialabelfileeditdialog'] = 'Faili muutmise dialoog';
+$labels['arialabelexportoptions'] = 'Eksportimise valikud';
+$labels['arialabelmorefileactions'] = 'Veel failitoiminguid';
+$labels['type.plain'] = 'Lihtteksti fail';
+$labels['type.vndoasisopendocumenttext'] = 'Tekstidokument (ODF)';
+$labels['type.html'] = 'HTML dokument';
diff --git a/plugins/kolab_files/localization/fi_FI.inc b/plugins/kolab_files/localization/fi_FI.inc
index fbab56d7..59619307 100644
--- a/plugins/kolab_files/localization/fi_FI.inc
+++ b/plugins/kolab_files/localization/fi_FI.inc
@@ -18,9 +18,16 @@ $labels['fromcloud'] = 'Pilvestä...';
 $labels['selectfiles'] = 'Valitse yksi tai useampi liitettävä tiedosto...';
 $labels['attachsel'] = 'Liitä valitut';
 $labels['foldercreate'] = 'Luo kansio';
+$labels['addfolder'] = 'Lisää kansio';
+$labels['foldershare'] = 'Jaa kansio';
 $labels['folderedit'] = 'Muokkaa kansiota';
+$labels['folderrename'] = 'Nimeä kansio uudelleen';
 $labels['foldermount'] = 'Lisää tallennustila';
 $labels['folderdelete'] = 'Poista kansio';
+$labels['folderoptions'] = 'Kansiovalinnat';
+$labels['findfolders'] = 'Etsi kansioita...';
+$labels['findfiles'] = 'Etsi tiedostoja';
+$labels['share'] = 'Jaa';
 $labels['folderinside'] = 'Aseta sisään';
 $labels['foldername'] = 'Kansion nimi';
 $labels['name'] = 'Nimi';
@@ -32,18 +39,29 @@ $labels['get'] = 'Lataa';
 $labels['getfile'] = 'Lataa tiedosto';
 $labels['view'] = 'Näytä';
 $labels['viewfile'] = 'Näytä tiedosto';
-$labels['rename'] = 'Muuta tiedoston nimeä';
+$labels['rename'] = 'Nimeä uudelleen';
 $labels['deletefile'] = 'Poista yksi tai useampi tiedosto';
 $labels['edit'] = 'Muokkaa';
 $labels['editfile'] = 'Muokkaa tiedostoa';
 $labels['save'] = 'Tallenna';
 $labels['savefile'] = 'Tallenna tiedosto';
 $labels['printfile'] = 'Tulosta tiedosto';
-$labels['fileedit'] = 'Tiedoston ominaisuudet';
+$labels['renamefile'] = 'Nimeä tiedosto uudelleen';
+$labels['createfile'] = 'Luo tiedosto';
+$labels['createandedit'] = 'Luo ja muokkaa';
+$labels['copyfile'] = 'Kopioi tiedosto';
+$labels['copyandedit'] = 'Kopioi ja muokkaa';
+$labels['documenttitle'] = 'Nimi:';
+$labels['close'] = 'Sulje';
+$labels['docedit'] = 'Asiakirjan muokkaus';
+$labels['submit'] = 'Lähetä';
+$labels['confirmpassword'] = 'Vahvista salasana';
+$labels['passwordconflict'] = 'Salasanat eivät täsmää';
 $labels['collection_audio'] = 'Ääni';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Kuvat';
 $labels['collection_document'] = 'Asiakirjat';
+$labels['sessions'] = 'Istunnot';
 $labels['uploading'] = 'Lähetetään tiedostoja...';
 $labels['attaching'] = 'Liitetään tiedostoja...';
 $labels['authenticating'] = 'Tunnistaudutaan...';
@@ -61,6 +79,7 @@ $labels['saveallnotice'] = '$n tiedosto(a) tallennettiin onnistuneesti.';
 $labels['saveallerror'] = '$n tiedoston tallentaminen epäonnistui.';
 $labels['attacherror'] = 'Tiedostojen liittäminen pilvestä epäonnistui';
 $labels['fileupdating'] = 'Päivitetään tiedostoa...';
+$labels['filecreating'] = 'Luodaan tiedostoa...';
 $labels['filemoving'] = 'Siirretään tiedosto(ja)...';
 $labels['filecopying'] = 'Kopioidaan tiedosto(ja)...';
 $labels['filedeleting'] = 'Poistetaan tiedosto(ja)...';
@@ -69,17 +88,81 @@ $labels['filedeletenotice'] = 'Tiedosto(t) poistettiin onnistuneesti.';
 $labels['filemovenotice'] = 'Tiedosto(t) siirrettiin onnistuneesti.';
 $labels['filecopynotice'] = 'Tiedosto(t) kopioitiin onnistuneesti.';
 $labels['uploadsizeerror'] = 'Lähetykse enimmäiskoko ($size) ylitetty!';
+$labels['updatingfoldershares'] = 'Päivitetään kansion oikeuksia...';
+$labels['updatingfolderupload-link'] = 'Päivitetään lähetyslinkkiä...';
+$labels['updatingfolderdownload-link'] = 'Päivitetään latauslinkkiä...';
+$labels['listpermanent'] = 'Luetteloi pysyvästi';
+$labels['additionalfolders'] = 'Lisäkansiot';
 $labels['allfolders'] = 'etsi kaikista kansioista';
 $labels['fileskip'] = 'Ohita';
 $labels['fileskipall'] = 'Ohita kaikki';
 $labels['fileoverwrite'] = 'Korvaa';
 $labels['fileoverwriteall'] = 'Korvaa kaikki';
 $labels['filemoveconfirm'] = 'Tämä toiminto korvaa kohdetiedoston: <b>$file</b>.';
+$labels['editfiledialog'] = 'Vahvista muokkaustoiminto';
+$labels['editfilesessions'] = 'Tähän tiedostoon kohdistuu meneillään olevia istuntoja. Valitse haluamasi toiminto.';
+$labels['newsession'] = 'Luo uusi istunto';
+$labels['newsessionro'] = 'Luo uusi istunto (kopioi tiedosto luku- ja kirjoitusmuodossa olevaan sijaintiin)';
+$labels['ownedsession'] = 'Jatka nykyistä istuntoa';
+$labels['invitedsession'] = 'Liity käyttäjän $user istuntoon';
+$labels['joinsession'] = 'Pyydä kutsu käyttäjältä $user';
+$labels['editfilero'] = 'Tämä tiedosto on "vain luku"-muodossa. Haluatko luoda ja muokata kopiota kyseisestä tiedostosta?';
+$labels['editfilerotitle'] = 'Vain luku -tiedosto';
+$labels['select'] = 'Valitse';
+$labels['terminatesession'] = 'Lopeta istunto';
+$labels['sessionterminatedtitle'] = 'Istunto lopetettu';
+$labels['sessionterminated'] = 'Istunto on lopetettu. Tämä ikkuna suljetaan.';
+$labels['terminate'] = 'Lopeta';
+$labels['sessionterminating'] = 'Lopetetaan istunto...';
+$labels['unsavedchanges'] = 'Asiakirjassa on tallentamattomia muutoksia, jotka katoavat. Haluatko silti lopettaa istunnon?';
+$labels['manageeditors'] = 'Kutsu asiakirjaan';
+$labels['participant'] = 'Osallistujat';
+$labels['status'] = 'Tila';
+$labels['addparticipant'] = 'Lisää osallistuja';
+$labels['delparticipant'] = 'Poista osallistuja';
+$labels['invitationtexttitle'] = 'Tämä kommentti lisätään osallistujalle lähetettävään kutsuun tai ilmoitusviestiin';
+$labels['invitationtextlabel'] = 'Kutsun/herätteen kommentit';
+$labels['statusorganizer'] = 'Järjestäjä';
+$labels['statusinvited'] = 'Kutsuttu';
+$labels['statusaccepted'] = 'Hyväksytty';
+$labels['statusdeclined'] = 'Kieltäydytty';
+$labels['statusrequested'] = 'Pyydetty';
+$labels['documentinviting'] = 'Kutsutaan yksi tai useampi osallistuja...';
+$labels['documentcancelling'] = 'Poistetaan yksi tai useampi osallistuja...';
+$labels['removeparticipant'] = 'Poista';
+$labels['invitednotice'] = '$owner kutsui sinut muokkausistuntoon.';
+$labels['acceptedownernotice'] = '$owner hyväksyi pyyntösi liittyä muokkausistuntoon.';
+$labels['declinedownernotice'] = '$owner kieltäytyi pyynnöstäsi liittyä muokkausistuntoon.';
+$labels['acceptednotice'] = '$user hyväksyi kutsusi muokkausistuntoon.';
+$labels['declinednotice'] = '$user kieltäytyi kutsustasi muokkausistuntoon.';
+$labels['requestednotice'] = '$user pyysi liittyä muokkausistuntoon. ';
+$labels['sessiondialog'] = 'Asiakirjan muokkausistunto';
+$labels['sessiondialogcontent'] = 'Tiedostoon $file, jonka on luonut $owner, kohdistuu meneillään oleva muokkausistunto.';
+$labels['more'] = 'Lisää.';
+$labels['accept'] = 'Hyväksy';
+$labels['join'] = 'Liity istuntoon';
+$labels['decline'] = 'Kieltäydy';
+$labels['owner'] = 'Omistaja';
+$labels['when'] = 'Ajankohta';
+$labels['file'] = 'Tiedosto';
+$labels['comment'] = 'Kommentti';
+$labels['open'] = 'Avaa';
+$labels['request'] = 'Pyydä kutsua';
+$labels['invitationtitle'] = 'Kutsu tiedostolle $file';
+$labels['invitationaccepting'] = 'Hyväksytään kutsu...';
+$labels['invitationdeclining'] = 'Kieltäydytään kutsusta...';
+$labels['invitationrequesting'] = 'Pyydetään kutsua...';
 $labels['storepasswords'] = 'muista salasana';
 $labels['storepasswordsdesc'] = 'Tallennetut salasanat salataan. Ota tämä asetus käyttöön, jos et halua salasanaa kysyttävän jokaisella kirjautumiskerralla tai haluat tämän tallennustilan olevan käytettävissä WebDAVin välityksellä.';
+$labels['sharepermissionerror'] = 'Oikeutesi eivät riitä tämän kansion jakamisen hallintaan.';
+$labels['sharestorageerror'] = 'Kansion jakamistietojen saaminen epäonnistui.';
 $labels['arialabelsearchform'] = 'Tiedostojen hakulomake';
+$labels['arialabelquicksearchbox'] = 'Hakusyöte';
+$labels['arialabellistoptions'] = 'Tiedostojen listausvalinnat';
 $labels['arialabelfolderoptions'] = 'Kansion toiminnot';
 $labels['arialabelfileeditform'] = 'Tiedoston muokkauslomake';
+$labels['arialabelfilecreateform'] = 'Tiedoston luomislomake';
+$labels['arialabelfilelist'] = 'Luettelo tiedostoista';
 $labels['arialabelfoldercreateform'] = 'Kansion luontilomake';
 $labels['arialabelfoldereditform'] = 'Kansion muokkauslomake';
 $labels['arialabelfoldermountform'] = 'Erillisen tallennustilan lomake';
@@ -90,4 +173,11 @@ $labels['arialabelattachmentoptions'] = 'Liitteen tallennusvalinnat';
 $labels['arialabelfilesavedialog'] = 'Tiedostojen tallennusikkuna';
 $labels['arialabelfileprops'] = 'Tiedoston ominaisuudet';
 $labels['arialabelfilecontent'] = 'Tiedoston sisältö';
-?>
+$labels['arialabelfileeditdialog'] = 'Tiedoston muokkausikkuna';
+$labels['arialabelfilerenameform'] = 'Tiedoston uudelleen nimeämisen lomake';
+$labels['arialabelfilesessiondialog'] = 'Asiakirjan muokkausistunto';
+$labels['arialabelexportoptions'] = 'Vientivalinnat';
+$labels['arialabelmorefileactions'] = 'Lisää tiedostotoimenpiteitä';
+$labels['type.plain'] = 'Raakatekstiasiakirja';
+$labels['type.vndoasisopendocumenttext'] = 'Tekstiasiakirja (ODF)';
+$labels['type.html'] = 'HTML-asiakirja';
diff --git a/plugins/kolab_files/localization/fr_FR.inc b/plugins/kolab_files/localization/fr_FR.inc
index fdc61ed7..92a03c4c 100644
--- a/plugins/kolab_files/localization/fr_FR.inc
+++ b/plugins/kolab_files/localization/fr_FR.inc
@@ -7,17 +7,20 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Fichiers';
-$labels['filepreview'] = 'Fichier d\'aperçu';
-$labels['saveall'] = 'Enregistrer tout dans le nuage...';
+$labels['filepreview'] = 'Aperçu du fichier';
+$labels['saveall'] = 'Tout enregistrer dans le nuage...';
 $labels['saveto'] = 'Enregistrer dans le nuage...';
-$labels['saveas'] = 'Enregistrer sous:';
+$labels['saveas'] = 'Enregistrer sous :';
 $labels['create'] = 'Créer';
 $labels['save'] = 'Enregistrer';
 $labels['cancel'] = 'Annuler';
 $labels['fromcloud'] = 'Depuis le nuage...';
-$labels['selectfiles'] = 'Sélectionnez le(s) fichier(s) à attacher..';
+$labels['selectfiles'] = 'Sélectionnez le(s) fichier(s) à attacher...';
 $labels['attachsel'] = 'Attachement sélectionné';
 $labels['foldercreate'] = 'Nouveau répertoire';
+$labels['folderedit'] = 'Modifier le répertoire';
+$labels['folderrename'] = 'Renommer le répertoire';
+$labels['foldermount'] = 'Ajout stockage';
 $labels['folderdelete'] = 'Supprimer le répertoire';
 $labels['folderinside'] = 'Ajouter à l\'intérieur';
 $labels['foldername'] = 'Nom du répertoire';
@@ -30,56 +33,135 @@ $labels['get'] = 'Télécharger';
 $labels['getfile'] = 'Téléchargement de fichier(s)';
 $labels['view'] = 'Voir';
 $labels['viewfile'] = 'Voir le fichier';
-$labels['rename'] = 'Renommer le fichier';
+$labels['rename'] = 'Renommer';
 $labels['deletefile'] = 'Supprimer le(s) fichier(s)';
 $labels['edit'] = 'Modifier';
 $labels['editfile'] = 'Modifier le fichier';
 $labels['save'] = 'Enregistrer';
 $labels['savefile'] = 'Sauvegarder le fichier';
 $labels['printfile'] = 'Imprimer le fichier';
-$labels['fileedit'] = 'Propriétés du fichier';
+$labels['renamefile'] = 'Renommer un fichier';
+$labels['createfile'] = 'Créer un fichier';
+$labels['createandedit'] = 'Créer et modifier';
+$labels['copyfile'] = 'Copier un fichier';
+$labels['copyandedit'] = 'Copier et modifier';
+$labels['documenttitle'] = 'Titre :';
+$labels['close'] = 'Fermer';
+$labels['submit'] = 'Envoyer';
+$labels['confirmpassword'] = 'Confirmer le mot de passe';
 $labels['collection_audio'] = 'Son';
 $labels['collection_video'] = 'Vidéo';
 $labels['collection_image'] = 'Images';
 $labels['collection_document'] = 'Documents';
-$labels['uploading'] = 'Téléversement de(s) fichier(s)...';
-$labels['attaching'] = 'Attachement de fichier(s)...';
+$labels['sessions'] = 'Sessions';
+$labels['uploading'] = 'Téléversement du(des) fichier(s)...';
+$labels['attaching'] = 'Ajout du(des) fichier(s)...';
+$labels['authenticating'] = 'Authentification...';
 $labels['foldercreating'] = 'Création d\'un répertoire...';
 $labels['folderupdating'] = 'Mise à jour d\'un répertoire...';
+$labels['foldermounting'] = 'Ajout de stockage externe...';
 $labels['folderdeleting'] = 'Suppression d\'un répertoire...';
 $labels['folderdeleteconfirm'] = 'Êtes-vous sûr de de vouloir supprimer le répertoire sélectionné ?';
 $labels['folderdeletenotice'] = 'Le répertoire a été supprimé.';
 $labels['folderupdatenotice'] = 'Le répertoire a été mis à jour.';
 $labels['foldercreatenotice'] = 'Le répertoire a été créé.';
-$labels['saveallnotice'] = '$n fichier(s) ont été sauvegardé(s)';
+$labels['foldermountnotice'] = 'Stockage ajouté avec succès.';
+$labels['folderauthtitle'] = 'Connexion à $title';
+$labels['saveallnotice'] = '$n fichier(s) a(ont) été sauvegardé(s)';
 $labels['saveallerror'] = 'La sauvegarde de $n fichier(s) a échoué.';
-$labels['attacherror'] = 'L\'attachement de fichier(s) depuis le nuage a échoué';
+$labels['attacherror'] = 'L\'ajout du(des) fichier(s) depuis le nuage a échoué';
 $labels['fileupdating'] = 'Modification du fichier...';
-$labels['filemoving'] = 'Déplacement de fichier(s)...';
-$labels['filecopying'] = 'Copie de fichier(s)...';
-$labels['filedeleting'] = 'Suppression de fichier(s)...';
+$labels['filecreating'] = 'Création du fichier...';
+$labels['filemoving'] = 'Déplacement du(des) fichier(s)...';
+$labels['filecopying'] = 'Copie du(des) fichier(s)...';
+$labels['filedeleting'] = 'Suppression du(des) fichier(s)...';
 $labels['filedeleteconfirm'] = 'Êtes-vous sûr de de vouloir supprimer les fichiers sélectionnés ?';
-$labels['filedeletenotice'] = 'Le(s) fichier(s) ont été supprimé(s).';
-$labels['filemovenotice'] = 'Le(s) fichier(s) ont été déplacé(s).';
-$labels['filecopynotice'] = 'Le(s) fichier(s) ont été copié(s).';
-$labels['uploadsizeerror'] = 'La taille du fichier maximale ($size) est dépassée!';
+$labels['filedeletenotice'] = 'Le(s) fichier(s) a(ont) été supprimé(s).';
+$labels['filemovenotice'] = 'Le(s) fichier(s) a(ont) été déplacé(s).';
+$labels['filecopynotice'] = 'Le(s) fichier(s) a(ont) été copié(s).';
+$labels['uploadsizeerror'] = 'La taille maximale du fichier ($size) est dépassée !';
+$labels['listpermanent'] = 'Lister définitivement';
+$labels['additionalfolders'] = 'Dossiers supplémentaires';
 $labels['allfolders'] = 'Recherche dans tous les répertoires';
 $labels['fileskip'] = 'Ignorer';
 $labels['fileskipall'] = 'Ignorer tout';
 $labels['fileoverwrite'] = 'Écraser';
 $labels['fileoverwriteall'] = 'Écraser tout';
 $labels['filemoveconfirm'] = 'Cette action va écraser le fichier de destination : <b>$file</b>.';
-$labels['arialabelsearchform'] = 'Zone de recherche des fichiers';
+$labels['editfiledialog'] = 'Confirmer la modification';
+$labels['editfilesessions'] = 'Des sessions sont en cours pour le fichier choisi. Veuillez choisir l\'action souhaitée.';
+$labels['newsession'] = 'Créer une nouvelle session';
+$labels['newsessionro'] = 'Créer une nouvelle session (copier le fichier à l\'emplacement d\'écriture/de lecture)';
+$labels['ownedsession'] = 'Poursuivre votre session existante';
+$labels['invitedsession'] = 'Rejoindre la session de $user';
+$labels['joinsession'] = 'Demander une invitation à $user';
+$labels['editfilero'] = 'Ce fichier est disponible en lecture seule. Souhaitez-vous créer et modifier une copie du fichier ?';
+$labels['editfilerotitle'] = 'Fichier en lecture seule';
+$labels['select'] = 'Sélectionner';
+$labels['terminatesession'] = 'Fermer la session';
+$labels['sessionterminatedtitle'] = 'Session terminée';
+$labels['sessionterminated'] = 'La session est terminée. La fenêtre va être fermée.';
+$labels['terminate'] = 'Terminer';
+$labels['sessionterminating'] = 'La session va prendre fin...';
+$labels['unsavedchanges'] = 'Les modifications non sauvegardées dans ce document seront perdues. Souhaitez-vous tout de même mettre fin à la session  ?';
+$labels['manageeditors'] = 'Inviter dans le document';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Statut';
+$labels['addparticipant'] = 'Ajouter un participant';
+$labels['delparticipant'] = 'Retirer le participant';
+$labels['invitationtexttitle'] = 'Ce commentaire sera joint au message d\'invitation/notification envoyé au participant';
+$labels['invitationtextlabel'] = 'Commentaire d’invitation ou de notification';
+$labels['statusorganizer'] = 'Organisateur';
+$labels['statusinvited'] = 'Invité';
+$labels['statusaccepted'] = 'Accepté';
+$labels['statusdeclined'] = 'Refusé';
+$labels['statusrequested'] = 'Demandé';
+$labels['documentinviting'] = 'Invitation du ou des participant(s) en cours';
+$labels['documentcancelling'] = 'Retrait du ou des participant(s)...';
+$labels['removeparticipant'] = 'Supprimer';
+$labels['invitednotice'] = 'Vous avez été invité par $owner à rejoindre la session de modification.';
+$labels['acceptedownernotice'] = '$owner a accepté votre demande à rejoindre la session de modification.';
+$labels['declinedownernotice'] = '$owner a décliné votre demande à rejoindre la session de modification.';
+$labels['acceptednotice'] = '$user a accepté votre invitation à rejoindre la session de modification.';
+$labels['declinednotice'] = '$user a décliné votre invitation à rejoindre la session de modification.';
+$labels['requestednotice'] = '$user a demandé à rejoindre la session de modification';
+$labels['sessiondialog'] = 'Session de modification du document';
+$labels['sessiondialogcontent'] = 'Un session de modification est en cours pour $file créé par $owner';
+$labels['more'] = 'Plus.';
+$labels['accept'] = 'Accepter';
+$labels['join'] = 'Rejoindre la session';
+$labels['decline'] = 'Refuser';
+$labels['owner'] = 'Propriétaire';
+$labels['when'] = 'Quand';
+$labels['file'] = 'Fichier';
+$labels['comment'] = 'Commentaire';
+$labels['open'] = 'Ouvrir';
+$labels['request'] = 'Demander une invitation';
+$labels['invitationtitle'] = 'Invitation pour $file';
+$labels['invitationaccepting'] = 'Invitation acceptée...';
+$labels['invitationdeclining'] = 'Invitation déclinée...';
+$labels['invitationrequesting'] = 'Demande d\'invitation...';
+$labels['storepasswords'] = 'se souvenir du mot de passe';
+$labels['storepasswordsdesc'] = 'Les mots de passe stockés seront chiffrés. Autorisez ceci si vous ne voulez pas que le mot de passe vous soit demandé à chaque connexion ou si vous voulez que ce stockage soit disponible via WebDAV.';
+$labels['arialabelsearchform'] = 'Formulaire de recherche des fichiers';
 $labels['arialabelquicksearchbox'] = 'Champ de recherche';
 $labels['arialabellistoptions'] = 'Liste d\'options des fichiers';
 $labels['arialabelfolderoptions'] = 'Actions de dossier';
-$labels['arialabelfileeditform'] = 'Zone d\'édition de fichier';
-$labels['arialabelfoldercreateform'] = 'Zone de création de dossier';
-$labels['arialabelfoldereditform'] = 'Zone d\'édition de dossier';
-$labels['arialabelfolderlist'] = 'Sélection de dossier';
-$labels['arialabelfileselectdialog'] = ' Fenêtre de dialogue de sélection de fichier.';
+$labels['arialabelfileeditform'] = 'Formulaire d\'édition de fichiers';
+$labels['arialabelfilecreateform'] = 'Formulaire de création de fichiers';
+$labels['arialabelfilelist'] = 'Liste des fichiers';
+$labels['arialabelfoldercreateform'] = 'Formulaire de création de dossiers';
+$labels['arialabelfoldereditform'] = 'Formulaire d\'édition de dossiers';
+$labels['arialabelfoldermountform'] = 'Formulaire de stockage externe';
+$labels['arialabelfolderauthform'] = 'Formulaire d\'authentification de stockage externe';
+$labels['arialabelfolderlist'] = 'Sélection de dossier/de collection';
+$labels['arialabelfileselectdialog'] = ' Fenêtre de sélection de fichier.';
 $labels['arialabelattachmentoptions'] = 'Options d\'enregistrement des pièces jointes';
-$labels['arialabelfilesavedialog'] = 'Boite de dialogue d\'enregistrement de fichier(s)';
+$labels['arialabelfilesavedialog'] = 'Boîte de dialogue d\'enregistrement du(des) fichier(s)';
 $labels['arialabelfileprops'] = 'Propriétés du fichier';
-$labels['arialabelfilecontent'] = 'Contenu de fichier';
-?>
+$labels['arialabelfilecontent'] = 'Contenu du fichier';
+$labels['arialabelfileeditdialog'] = 'Fenêtre de modification de fichier';
+$labels['arialabelfilesessiondialog'] = 'Session de modification du document';
+$labels['type.plain'] = 'Document texte simple';
+$labels['type.vndoasisopendocumenttext'] = 'Document texte (ODF)';
+$labels['type.html'] = 'Fichier HTML';
diff --git a/plugins/kolab_files/localization/he_IL.inc b/plugins/kolab_files/localization/he_IL.inc
new file mode 100644
index 00000000..8bc29ad1
--- /dev/null
+++ b/plugins/kolab_files/localization/he_IL.inc
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['listpermanent'] = 'List permanently';
+$labels['select'] = 'Select';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Add participant';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizer';
+$labels['owner'] = 'Owner';
+$labels['comment'] = 'Comment';
diff --git a/plugins/kolab_files/localization/hr_HR.inc b/plugins/kolab_files/localization/hr_HR.inc
new file mode 100644
index 00000000..8bc29ad1
--- /dev/null
+++ b/plugins/kolab_files/localization/hr_HR.inc
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['listpermanent'] = 'List permanently';
+$labels['select'] = 'Select';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Add participant';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizer';
+$labels['owner'] = 'Owner';
+$labels['comment'] = 'Comment';
diff --git a/plugins/kolab_files/localization/hu_HU.inc b/plugins/kolab_files/localization/hu_HU.inc
index 1ac364c3..1238990b 100644
--- a/plugins/kolab_files/localization/hu_HU.inc
+++ b/plugins/kolab_files/localization/hu_HU.inc
@@ -17,6 +17,7 @@ $labels['fromcloud'] = 'Fájlfelhőből...';
 $labels['selectfiles'] = 'Csatolmányok kiválasztása...';
 $labels['attachsel'] = 'Jelölt fájlok csatolása';
 $labels['foldercreate'] = 'Mappa létrehozása';
+$labels['folderrename'] = 'Mappa átnevezése';
 $labels['folderdelete'] = 'Mappa törlése';
 $labels['folderinside'] = 'Almappa ide';
 $labels['foldername'] = 'Mappa neve';
@@ -29,14 +30,16 @@ $labels['get'] = 'Letöltés';
 $labels['getfile'] = 'Fájlok letöltése';
 $labels['view'] = 'Megtekintés';
 $labels['viewfile'] = 'Fájl megtekintése';
-$labels['rename'] = 'Átnevezés';
+$labels['rename'] = 'Rename';
 $labels['deletefile'] = 'Fájlok törlése';
 $labels['edit'] = 'Szerkesztés';
 $labels['editfile'] = 'Fájl szerkesztése';
 $labels['save'] = 'Mentés';
 $labels['savefile'] = 'Fájl mentése';
 $labels['printfile'] = 'Fájl nyomtatása';
-$labels['fileedit'] = 'Fájl tulajdonságai';
+$labels['close'] = 'Close';
+$labels['submit'] = 'Submit';
+$labels['confirmpassword'] = 'Confirm password';
 $labels['collection_audio'] = 'Hangfájlok';
 $labels['collection_video'] = 'Videó fájlok';
 $labels['collection_image'] = 'Képek';
@@ -59,11 +62,23 @@ $labels['filedeleteconfirm'] = 'Biztos benne, hogy törölni szeretné a kijelö
 $labels['filedeletenotice'] = 'Törlés sikeres.';
 $labels['filemovenotice'] = 'Áthelyezés sikeres.';
 $labels['filecopynotice'] = 'Másolás sikeres.';
+$labels['listpermanent'] = 'List permanently';
 $labels['allfolders'] = 'keresés minden mappában';
 $labels['fileskip'] = 'Kihagyás';
 $labels['fileskipall'] = 'Mindegyik kihagyása';
 $labels['fileoverwrite'] = 'Felülírás';
 $labels['fileoverwriteall'] = 'Mindegyik felülírása';
 $labels['filemoveconfirm'] = 'Ezzel a művelettel felülíródik a fájl: <b>$file</b>.';
+$labels['select'] = 'Jelölés';
+$labels['participant'] = 'Résztvevő';
+$labels['status'] = 'Stát.';
+$labels['addparticipant'] = 'Résztvevő meghívása';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Szervező';
+$labels['removeparticipant'] = 'Eltávolítás';
+$labels['accept'] = 'Elfogadás';
+$labels['decline'] = 'Elutasítás';
+$labels['owner'] = 'Tulajdonos';
+$labels['comment'] = 'Comment';
+$labels['open'] = 'Open';
 $labels['arialabelfileprops'] = 'Fájl tulajdonságai';
-?>
diff --git a/plugins/kolab_files/localization/it_IT.inc b/plugins/kolab_files/localization/it_IT.inc
index 02db2cd6..ffd6de04 100644
--- a/plugins/kolab_files/localization/it_IT.inc
+++ b/plugins/kolab_files/localization/it_IT.inc
@@ -19,6 +19,7 @@ $labels['selectfiles'] = 'Seleziona file da allegare...';
 $labels['attachsel'] = 'Allega selezionati';
 $labels['foldercreate'] = 'Crea cartella';
 $labels['folderedit'] = 'Modifica cartella';
+$labels['folderrename'] = 'Rinomina cartella';
 $labels['foldermount'] = 'Aggiungi spazio di archiviazione';
 $labels['folderdelete'] = 'Elimina cartella';
 $labels['folderinside'] = 'Inserisci dentro';
@@ -32,14 +33,15 @@ $labels['get'] = 'Scarica';
 $labels['getfile'] = 'Scarica file';
 $labels['view'] = 'Visualizza';
 $labels['viewfile'] = 'Visualizza file';
-$labels['rename'] = 'Rinomina file';
+$labels['rename'] = 'Rinomina';
 $labels['deletefile'] = 'Elimina file';
 $labels['edit'] = 'Modifica';
 $labels['editfile'] = 'Modifica file';
 $labels['save'] = 'Salva';
 $labels['savefile'] = 'Salva file';
 $labels['printfile'] = 'Stampa file';
-$labels['fileedit'] = 'Proprietà file';
+$labels['close'] = 'Chiudi';
+$labels['submit'] = 'Invia';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Immagini';
@@ -69,12 +71,25 @@ $labels['filedeletenotice'] = 'File eliminati correttamente.';
 $labels['filemovenotice'] = 'File spostati correttamente.';
 $labels['filecopynotice'] = 'File copiati correttamente.';
 $labels['uploadsizeerror'] = 'Dimensione massima del file ($size) superata!';
+$labels['listpermanent'] = 'Elenca sempre';
 $labels['allfolders'] = 'cerca in tutte le cartelle';
 $labels['fileskip'] = 'Salta';
 $labels['fileskipall'] = 'Salta tutti';
 $labels['fileoverwrite'] = 'Sovrascrivi';
 $labels['fileoverwriteall'] = 'Sovrascrivi tutti';
 $labels['filemoveconfirm'] = 'Questa azione sovrascriverà i file di destinazione: <b>$file</b>.';
+$labels['select'] = 'Seleziona';
+$labels['participant'] = 'Partecipante';
+$labels['status'] = 'Stato';
+$labels['addparticipant'] = 'Aggiungi partecipante';
+$labels['invitationtextlabel'] = 'Commento all\'invito/notifica';
+$labels['statusorganizer'] = 'Organizzatore';
+$labels['removeparticipant'] = 'Elimina';
+$labels['accept'] = 'Accetta';
+$labels['decline'] = 'Rifiuta';
+$labels['owner'] = 'Proprietario';
+$labels['comment'] = 'Commento';
+$labels['open'] = 'Apri';
 $labels['storepasswords'] = 'Ricorda password';
 $labels['storepasswordsdesc'] = 'Le password salvate verrano cifrate. Abilita questa funzione se non vuoi che ti venga richiesta la password ad ogni login o se vuoi che questo storage sia disponibile via WebDAV.';
 $labels['arialabelsearchform'] = 'Modulo ricerca file';
@@ -92,4 +107,3 @@ $labels['arialabelattachmentoptions'] = 'Opzioni salvataggio allegati';
 $labels['arialabelfilesavedialog'] = 'Dialogo salvataggio file';
 $labels['arialabelfileprops'] = 'Proprietà file';
 $labels['arialabelfilecontent'] = 'Contenuto file';
-?>
diff --git a/plugins/kolab_files/localization/ja_JP.inc b/plugins/kolab_files/localization/ja_JP.inc
index 8265a184..a186ce50 100644
--- a/plugins/kolab_files/localization/ja_JP.inc
+++ b/plugins/kolab_files/localization/ja_JP.inc
@@ -7,11 +7,105 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'ファイル';
+$labels['filepreview'] = 'ファイルプレビュー';
+$labels['saveall'] = '全てクラウドに保存...';
+$labels['saveto'] = 'クラウドに保存';
+$labels['saveas'] = '名前を付けて保存:';
+$labels['create'] = '新規作成';
 $labels['save'] = '保存';
 $labels['cancel'] = 'キャンセル';
+$labels['fromcloud'] = 'クラウドから…';
+$labels['selectfiles'] = '添付ファイル(s)を選択…';
+$labels['attachsel'] = '選択済を添付';
+$labels['foldercreate'] = 'フォルダを作成';
+$labels['folderedit'] = 'フォルダを編集';
+$labels['foldermount'] = 'ストレージを追加';
+$labels['folderdelete'] = 'フォルダを削除';
 $labels['folderinside'] = '内に挿入';
 $labels['foldername'] = 'フォルダネーム';
 $labels['name'] = '名前';
+$labels['mtime'] = '変更';
+$labels['type'] = 'タイプ';
+$labels['upload'] = 'アップロード';
+$labels['uploadfile'] = 'ファイル(s)をアップロード';
+$labels['get'] = 'ダウンロード';
+$labels['getfile'] = 'ファイルをダウンロード';
+$labels['view'] = '一覧';
+$labels['viewfile'] = 'ファイル一覧';
+$labels['rename'] = '名前を変更';
+$labels['deletefile'] = 'ファイル(s)を削除';
 $labels['edit'] = '編集';
+$labels['editfile'] = 'ファイルを編集';
 $labels['save'] = '保存';
-?>
+$labels['savefile'] = 'ファイルを保存';
+$labels['printfile'] = 'ファイルを印刷';
+$labels['close'] = '閉じる';
+$labels['submit'] = '適用';
+$labels['confirmpassword'] = 'パスワードの確認';
+$labels['collection_audio'] = 'オーディオ';
+$labels['collection_video'] = 'ビデオ';
+$labels['collection_image'] = '画像';
+$labels['collection_document'] = 'ドキュメント';
+$labels['uploading'] = 'ファイル(s)をアップロード中…';
+$labels['attaching'] = 'ファイル(s)を添付中…';
+$labels['authenticating'] = '認証中…';
+$labels['foldercreating'] = 'フォルダを作成...';
+$labels['folderupdating'] = 'フォルダを更新…';
+$labels['foldermounting'] = '外部ストレージを追加…';
+$labels['folderdeleting'] = 'フォルダを削除…';
+$labels['folderdeleteconfirm'] = '本当に選択したフォルダを削除しますか?';
+$labels['folderdeletenotice'] = 'フォルダの削除に成功しました。';
+$labels['folderupdatenotice'] = 'フォルダの更新に成功しました。';
+$labels['foldercreatenotice'] = 'フォルダの作成に成功しました。';
+$labels['foldermountnotice'] = 'ストレージの追加に成功しました。';
+$labels['folderauthtitle'] = '$title へログオン';
+$labels['saveallnotice'] = '保存に成功しました $n ファイル(s)。';
+$labels['saveallerror'] = '$n ファイル(s) の保存に失敗しました。';
+$labels['attacherror'] = 'クラウドからのファイル(s)の添付に失敗しました';
+$labels['fileupdating'] = 'ファイルの更新…';
+$labels['filemoving'] = 'ファイル(s)の移動中…';
+$labels['filecopying'] = 'ファイル(s)のコピー中…';
+$labels['filedeleting'] = 'ファイル(s)の削除中…';
+$labels['filedeleteconfirm'] = '本当に選択したファイルを削除しますか?';
+$labels['filedeletenotice'] = 'ファイル(s)の削除に成功しました。';
+$labels['filemovenotice'] = 'ファイル(s)の移動に成功しました。';
+$labels['filecopynotice'] = 'ファイル(s)のコピーに成功しました。';
+$labels['uploadsizeerror'] = 'ファイルの最大サイズ($size) を越えています!';
+$labels['listpermanent'] = '継続的リスト';
+$labels['allfolders'] = '全てのフォルダを検索';
+$labels['fileskip'] = 'スキップ';
+$labels['fileskipall'] = '全てスキップ';
+$labels['fileoverwrite'] = '上書き';
+$labels['fileoverwriteall'] = '全て上書き';
+$labels['filemoveconfirm'] = 'このファイルで移動先のファイルを上書きします: <b>$file</b>。';
+$labels['select'] = '選択';
+$labels['participant'] = '参加者';
+$labels['status'] = '状態';
+$labels['addparticipant'] = '参加者追加';
+$labels['invitationtextlabel'] = '招待/通知コメント';
+$labels['statusorganizer'] = '編成者';
+$labels['statusaccepted'] = '承諾されました';
+$labels['statusdeclined'] = '辞退されました';
+$labels['removeparticipant'] = '削除';
+$labels['accept'] = '承諾';
+$labels['decline'] = '辞退';
+$labels['owner'] = '所有者';
+$labels['comment'] = 'コメント';
+$labels['open'] = '開く';
+$labels['storepasswords'] = 'パスワードを記憶';
+$labels['storepasswordsdesc'] = '保存されたパスワードは暗号化されます。ログインの度にパスワードを入力しないで済む、または WebDAV で保存されたパスワードを利用可能にする際は、この機能を有効化してください。';
+$labels['arialabelsearchform'] = 'ファイル検索フォーム';
+$labels['arialabelquicksearchbox'] = '検索語入力';
+$labels['arialabellistoptions'] = 'ファイルリストオプション';
+$labels['arialabelfolderoptions'] = 'フォルダの操作';
+$labels['arialabelfileeditform'] = 'ファイル編集フォーム';
+$labels['arialabelfoldercreateform'] = 'フォルダ作成フォーム';
+$labels['arialabelfoldereditform'] = 'フォルダ編集フォーム';
+$labels['arialabelfoldermountform'] = '外部ストレージフォーム';
+$labels['arialabelfolderauthform'] = '外部ストレージ認証フォーム';
+$labels['arialabelfolderlist'] = 'フォルダ/コレクション選択';
+$labels['arialabelfileselectdialog'] = 'ファイル選択ダイアログ';
+$labels['arialabelattachmentoptions'] = '添付保存オプション';
+$labels['arialabelfilesavedialog'] = 'ファイル(s)保存ダイアログ';
+$labels['arialabelfileprops'] = 'ファイルのプロパティ';
+$labels['arialabelfilecontent'] = 'ファイル内容';
diff --git a/plugins/kolab_files/localization/ko_KR.inc b/plugins/kolab_files/localization/ko_KR.inc
new file mode 100644
index 00000000..9d8f1003
--- /dev/null
+++ b/plugins/kolab_files/localization/ko_KR.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['save'] = '저장';
+$labels['cancel'] = '취소';
+$labels['name'] = '이름';
+$labels['edit'] = '수정';
+$labels['save'] = '저장';
+$labels['select'] = '선택';
+$labels['participant'] = '참가자';
+$labels['status'] = '상태';
+$labels['addparticipant'] = '참가자 추가';
+$labels['statusorganizer'] = '주최자';
+$labels['comment'] = '코멘트';
diff --git a/plugins/kolab_files/localization/lv.inc b/plugins/kolab_files/localization/lv.inc
new file mode 100644
index 00000000..5cad1961
--- /dev/null
+++ b/plugins/kolab_files/localization/lv.inc
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'Faili';
+$labels['save'] = 'Saglabāt';
+$labels['cancel'] = 'Atcelt';
+$labels['folderinside'] = 'Ievietot';
+$labels['name'] = 'Nosaukums';
+$labels['edit'] = 'Labot';
+$labels['save'] = 'Saglabāt';
+$labels['close'] = 'Aizvērt';
+$labels['listpermanent'] = 'Rādīt sarakstā vienmēr';
+$labels['select'] = 'Izvēlēties';
+$labels['participant'] = 'Dalībnieks';
+$labels['status'] = 'Statuss';
+$labels['addparticipant'] = 'Pievienot dalībnieku';
+$labels['invitationtextlabel'] = 'Uzaicinājumam/paziņojuma komentārs';
+$labels['statusorganizer'] = 'Organizētājs';
+$labels['statusaccepted'] = 'Pieņemts';
+$labels['statusdeclined'] = 'Noraidīts';
+$labels['accept'] = 'Pieņemt';
+$labels['decline'] = 'Noraidīt';
+$labels['owner'] = 'Īpašnieks';
+$labels['comment'] = 'Komentārs';
diff --git a/plugins/kolab_files/localization/nl_NL.inc b/plugins/kolab_files/localization/nl_NL.inc
index 7424c1f2..a25a8750 100644
--- a/plugins/kolab_files/localization/nl_NL.inc
+++ b/plugins/kolab_files/localization/nl_NL.inc
@@ -7,64 +7,161 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Bestanden';
-$labels['saveall'] = 'Sla alles op in de cloud...';
-$labels['saveto'] = 'Sla op in de cloud...';
+$labels['filepreview'] = 'Bestandsvoorbeeld';
+$labels['saveall'] = 'Alles opslaan in de cloud...';
+$labels['saveto'] = 'Opslaan in de cloud...';
 $labels['saveas'] = 'Opslaan als:';
-$labels['create'] = 'Creëer';
+$labels['create'] = 'Maken';
 $labels['save'] = 'Opslaan';
 $labels['cancel'] = 'Annuleren';
 $labels['fromcloud'] = 'Uit de cloud...';
 $labels['selectfiles'] = 'Selecteer bestand(en) om toe te voegen...';
-$labels['attachsel'] = 'Voeg het geselekteerde toe';
-$labels['foldercreate'] = 'Creëer map';
-$labels['folderdelete'] = 'Verwijder map';
-$labels['folderinside'] = 'Insert inside';
-$labels['foldername'] = 'Map naam';
+$labels['attachsel'] = 'Selectie toevoegen';
+$labels['foldercreate'] = 'Map maken';
+$labels['folderedit'] = 'Map bewerken';
+$labels['folderrename'] = 'Hernoem map';
+$labels['foldermount'] = 'Opslag toevoegen';
+$labels['folderdelete'] = 'Map verwijderen';
+$labels['folderinside'] = 'Invoegen in';
+$labels['foldername'] = 'Mapnaam';
 $labels['name'] = 'Naam';
 $labels['mtime'] = 'Gewijzigd';
 $labels['type'] = 'Type';
-$labels['upload'] = 'Upload';
-$labels['uploadfile'] = 'Upload bestand(en)';
+$labels['upload'] = 'Uploaden';
+$labels['uploadfile'] = 'Bestand(en) uploaden';
 $labels['get'] = 'Downloaden';
-$labels['getfile'] = 'Download bestand';
-$labels['view'] = 'Bekijken';
-$labels['viewfile'] = 'Bekijk bestand';
-$labels['rename'] = 'Hernoem bestand';
-$labels['deletefile'] = 'Verwijder bestand(en)';
-$labels['edit'] = 'Wijzigen';
-$labels['editfile'] = 'Wijzig bestand';
+$labels['getfile'] = 'Bestand downloaden';
+$labels['view'] = 'Weergeven';
+$labels['viewfile'] = 'Bestand weergeven';
+$labels['rename'] = 'Naam wijzigen';
+$labels['deletefile'] = 'Bestand(en) verwijderen';
+$labels['edit'] = 'Bewerken';
+$labels['editfile'] = 'Bestand bewerken';
 $labels['save'] = 'Opslaan';
-$labels['savefile'] = 'Sla bestand op';
-$labels['printfile'] = 'Druk bestand af';
-$labels['fileedit'] = 'Eigenschappen van bestand';
-$labels['collection_audio'] = 'Geluid';
+$labels['savefile'] = 'Bestand opslaan';
+$labels['printfile'] = 'Bestand afdrukken';
+$labels['renamefile'] = 'Naam van bestand wijzigen';
+$labels['createfile'] = 'Bestand maken';
+$labels['createandedit'] = 'Maken en bewerken';
+$labels['copyfile'] = 'Bestand kopiëren';
+$labels['copyandedit'] = 'Kopiëren en bewerken';
+$labels['documenttitle'] = 'Naam:';
+$labels['close'] = 'Sluiten';
+$labels['submit'] = 'Versturen';
+$labels['confirmpassword'] = 'Wachtwoord bevestigen';
+$labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Afbeeldingen';
 $labels['collection_document'] = 'Documenten';
-$labels['uploading'] = 'Uploaden van bestand(en)...';
+$labels['sessions'] = 'Sessies';
+$labels['uploading'] = 'Bestand(en) uploaden...';
 $labels['attaching'] = 'Bestand(en) toevoegen...';
-$labels['foldercreating'] = 'Creëren van map...';
-$labels['folderdeleting'] = 'Verwijderen van map...';
+$labels['authenticating'] = 'Verifiëren...';
+$labels['foldercreating'] = 'Map maken...';
+$labels['folderupdating'] = 'Map bijwerken...';
+$labels['foldermounting'] = 'Externe opslag toevoegen...';
+$labels['folderdeleting'] = 'Map verwijderen...';
 $labels['folderdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde map wilt verwijderen?';
-$labels['folderdeletenotice'] = 'Map succesvol verwijderd.';
-$labels['foldercreatenotice'] = 'Map succesvol aangemaakt.';
-$labels['saveallnotice'] = 'Succesvol $n bestand(en) opgeslagen.';
-$labels['saveallerror'] = 'Opslaan van $n bestand(en) mislukt.';
-$labels['attacherror'] = 'Toevoegen van bestand(en) uit de cloud mislukt';
-$labels['fileupdating'] = 'Wijzigen van bestand...';
-$labels['filemoving'] = 'Verplaatsen van bestand(en)...';
-$labels['filecopying'] = 'Kopiëren van bestand(en)...';
-$labels['filedeleting'] = 'Verwijderen van bestand(en)...';
+$labels['folderdeletenotice'] = 'Map is met succes verwijderd.';
+$labels['folderupdatenotice'] = 'Map is met succes bijgewerkt.';
+$labels['foldercreatenotice'] = 'Map is met succes gemaakt.';
+$labels['foldermountnotice'] = 'Opslag is met succes toegevoegd.';
+$labels['folderauthtitle'] = 'Aanmelding bij $title';
+$labels['saveallnotice'] = '$n bestand(en) met succes opgeslagen.';
+$labels['saveallerror'] = 'Opslaan van $n bestand(en) is mislukt.';
+$labels['attacherror'] = 'Toevoegen van bestand(en) uit de cloud is mislukt';
+$labels['fileupdating'] = 'Bestand bijwerken...';
+$labels['filecreating'] = 'Bestand maken...';
+$labels['filemoving'] = 'Bestand(en) verplaatsen...';
+$labels['filecopying'] = 'Bestand(en) kopiëren...';
+$labels['filedeleting'] = 'Bestand(en) verwijderen...';
 $labels['filedeleteconfirm'] = 'Weet u zeker dat u de geselecteerde bestanden wilt verwijderen?';
-$labels['filedeletenotice'] = 'Bestand(en) succesvol verwijderd.';
-$labels['filemovenotice'] = 'Bestand(en) succesvol verplaatst.';
-$labels['filecopynotice'] = 'Bestand(en) succesvol gekopieerd.';
+$labels['filedeletenotice'] = 'Bestand(en) met succes verwijderd.';
+$labels['filemovenotice'] = 'Bestand(en) met succes verplaatst.';
+$labels['filecopynotice'] = 'Bestand(en) met succes gekopieerd.';
 $labels['uploadsizeerror'] = 'Maximale bestandsgrootte ($size)  overschreden!';
-$labels['allfolders'] = 'Zoek in alle mappen';
+$labels['listpermanent'] = 'Definitief weergeven';
+$labels['additionalfolders'] = 'Extra mappen';
+$labels['allfolders'] = 'zoeken in alle mappen';
 $labels['fileskip'] = 'Overslaan';
-$labels['fileskipall'] = 'Sla allen over';
+$labels['fileskipall'] = 'Alles overslaan';
 $labels['fileoverwrite'] = 'Overschrijven';
-$labels['fileoverwriteall'] = 'Overschrijf alle';
-$labels['filemoveconfirm'] = 'Deze actie overschrijft het volgende doelbestand: <b>$file</b>.';
+$labels['fileoverwriteall'] = 'Alles overschrijven';
+$labels['filemoveconfirm'] = 'Met deze actie overschrijft u het doelbestand: <b>$file</b>.';
+$labels['editfiledialog'] = 'Bewerking bevestigen';
+$labels['editfilesessions'] = 'Het geselecteerde bestand wordt in actieve sessies gebruikt. Selecteer de gewenste actie.';
+$labels['newsession'] = 'Nieuwe sessie maken';
+$labels['newsessionro'] = 'Nieuwe sessie maken (bestand kopiëren naar locatie met lees-/schrijfrechten)';
+$labels['ownedsession'] = 'Huidige sessie voortzetten';
+$labels['invitedsession'] = 'Deelnemen aan sessie van $user';
+$labels['joinsession'] = 'Uitnodiging aan $user vragen';
+$labels['editfilero'] = 'Dit bestand kan alleen worden gelezen. Wilt u een kopie van het bestand maken en bewerken?';
+$labels['editfilerotitle'] = 'Alleen-lezenbestand';
+$labels['select'] = 'Selecteren';
+$labels['terminatesession'] = 'Sessie beëindigen';
+$labels['sessionterminatedtitle'] = 'Sessie beëindigd';
+$labels['sessionterminated'] = 'De sessie is beëindigd. Het venster wordt gesloten.';
+$labels['terminate'] = 'Beëindigen';
+$labels['sessionterminating'] = 'Sessie wordt beëindigd...';
+$labels['unsavedchanges'] = 'Het document bevat wijzigingen die niet zijn opgeslagen en verloren zullen gaan. Wilt u de sessie toch beëindigen?';
+$labels['manageeditors'] = 'Uitnodigen voor document';
+$labels['participant'] = 'Deelnemer';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Deelnemer toevoegen';
+$labels['delparticipant'] = 'Deelnemer verwijderen';
+$labels['invitationtexttitle'] = 'Deze opmerking wordt toegevoegd aan de uitnodiging/melding die naar de deelnemer wordt verstuurd';
+$labels['invitationtextlabel'] = 'Opmerking bij uitnodiging/melding';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Uitgenodigd';
+$labels['statusaccepted'] = 'Geaccepteerd';
+$labels['statusdeclined'] = 'Geweigerd';
+$labels['statusrequested'] = 'Gevraagd';
+$labels['documentinviting'] = 'Deelnemer(s) uitnodigen...';
+$labels['documentcancelling'] = 'Deelnemer(s) verwijderen...';
+$labels['removeparticipant'] = 'Verwijderen';
+$labels['invitednotice'] = 'U bent uitgenodigd voor de bewerkingssessie door $owner.';
+$labels['acceptedownernotice'] = '$owner heeft uw verzoek om aan de bewerkingssessie deel te nemen geaccepteerd.';
+$labels['declinedownernotice'] = '$owner heeft uw verzoek om aan de bewerkingssessie deel te nemen geweigerd.';
+$labels['acceptednotice'] = '$user heeft uw uitnodiging voor de bewerkingssessie geaccepteerd.';
+$labels['declinednotice'] = '$user heeft uw uitnodiging voor de bewerkingssessie geweigerd.';
+$labels['requestednotice'] = '$user heeft gevraagd om deel te nemen aan de bewerkingssessie.';
+$labels['sessiondialog'] = 'Bewerkingssessie voor document';
+$labels['sessiondialogcontent'] = 'Er is een actieve bewerkingssessie $file die door $owner is gestart.';
+$labels['more'] = 'Meer.';
+$labels['accept'] = 'Accepteren';
+$labels['join'] = 'Deelnemen aan sessie';
+$labels['decline'] = 'Afslaan';
+$labels['owner'] = 'Eigenaar';
+$labels['when'] = 'Wanneer';
+$labels['file'] = 'Bestand';
+$labels['comment'] = 'Opmerking';
+$labels['open'] = 'Openen';
+$labels['request'] = 'Uitnodiging vragen';
+$labels['invitationtitle'] = 'Uitnodiging voor $file';
+$labels['invitationaccepting'] = 'Uitnodiging wordt geaccepteerd...';
+$labels['invitationdeclining'] = 'Uitnodiging wordt afgeslagen...';
+$labels['invitationrequesting'] = 'Uitnodiging wordt gevraagd...';
+$labels['storepasswords'] = 'wachtwoord onthouden';
+$labels['storepasswordsdesc'] = 'Opgeslagen wachtwoorden worden gecodeerd. Schakel deze optie in als u niet bij elke aanmelding het wachtwoord wilt invoeren of als u deze opslag beschikbaar wilt maken via WebDAV.';
+$labels['arialabelsearchform'] = 'Zoekformulier voor bestanden';
+$labels['arialabelquicksearchbox'] = 'Zoekopdracht';
+$labels['arialabellistoptions'] = 'Opties voor lijst met bestanden';
+$labels['arialabelfolderoptions'] = 'Mapacties';
+$labels['arialabelfileeditform'] = 'Formulier voor bewerking van bestanden';
+$labels['arialabelfilecreateform'] = 'Formulier voor aanmaak van bestanden';
+$labels['arialabelfilelist'] = 'Lijst met bestanden';
+$labels['arialabelfoldercreateform'] = 'Formulier voor aanmaak van mappen';
+$labels['arialabelfoldereditform'] = 'Formulier voor bewerking van mappen';
+$labels['arialabelfoldermountform'] = 'Formulier voor externe opslag';
+$labels['arialabelfolderauthform'] = 'Formulier voor verificatie van externe opslag';
+$labels['arialabelfolderlist'] = 'Map/verzameling selecteren';
+$labels['arialabelfileselectdialog'] = 'Dialoogvenster voor selectie van bestand';
+$labels['arialabelattachmentoptions'] = 'Opties voor opslag van bijlage';
+$labels['arialabelfilesavedialog'] = 'Dialoogvenster voor opslag van bestand(en)';
 $labels['arialabelfileprops'] = 'Eigenschappen van bestand';
-?>
+$labels['arialabelfilecontent'] = 'Bestandsinhoud';
+$labels['arialabelfileeditdialog'] = 'Dialoogvenster voor bewerking van bestand';
+$labels['arialabelfilesessiondialog'] = 'Bewerkingssessie voor document';
+$labels['type.plain'] = 'Document zonder opmaak';
+$labels['type.vndoasisopendocumenttext'] = 'Tekstdocument (ODF)';
+$labels['type.html'] = 'HTML-document';
diff --git a/plugins/kolab_files/localization/pl_PL.inc b/plugins/kolab_files/localization/pl_PL.inc
index 4fba4ec2..a6eb46a0 100644
--- a/plugins/kolab_files/localization/pl_PL.inc
+++ b/plugins/kolab_files/localization/pl_PL.inc
@@ -8,85 +8,49 @@
  */
 $labels['files'] = 'Pliki';
 $labels['filepreview'] = 'Podgląd pliku';
-$labels['saveall'] = 'Zapisz wszystkie w chmurze...';
-$labels['saveto'] = 'Zapisz w chmurze...';
 $labels['saveas'] = 'Zapisz jako:';
 $labels['create'] = 'Utwórz';
 $labels['save'] = 'Zapisz';
 $labels['cancel'] = 'Anuluj';
-$labels['fromcloud'] = 'Z chmury...';
-$labels['selectfiles'] = 'Wybierz pliki do załączenia...';
-$labels['attachsel'] = 'Załącz wybrane';
-$labels['foldercreate'] = 'Utwórz folder';
-$labels['folderedit'] = 'Edytuj folder';
-$labels['foldermount'] = 'Dodaj przestrzeń';
-$labels['folderdelete'] = 'Usuń folder';
 $labels['folderinside'] = 'Wstaw wewnątrz';
-$labels['foldername'] = 'Nazwa folderu';
 $labels['name'] = 'Nazwa';
 $labels['mtime'] = 'Zmodyfikowano';
 $labels['type'] = 'Typ';
-$labels['upload'] = 'Wyślij';
-$labels['uploadfile'] = 'Wyślij plik(i)';
 $labels['get'] = 'Pobierz';
 $labels['getfile'] = 'Pobierz plik';
-$labels['view'] = 'Podgląd';
-$labels['viewfile'] = 'Podgląd pliku';
-$labels['rename'] = 'Zmień nazwę pliku';
+$labels['rename'] = 'Zmień nazwę';
 $labels['deletefile'] = 'Usuń plik(i)';
 $labels['edit'] = 'Edytuj';
 $labels['editfile'] = 'Edytuj plik';
 $labels['save'] = 'Zapisz';
 $labels['savefile'] = 'Zapisz plik';
-$labels['printfile'] = 'Drukuj plik';
-$labels['fileedit'] = 'Właściwości pliku';
+$labels['printfile'] = 'Wydrukuj plik';
+$labels['close'] = 'Zamknij';
+$labels['submit'] = 'Wyślij';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Obrazy';
 $labels['collection_document'] = 'Dokumenty';
-$labels['uploading'] = 'Zapisywanie plików...';
-$labels['attaching'] = 'Załączanie plików...';
 $labels['authenticating'] = 'Uwierzytelnianie...';
-$labels['foldercreating'] = 'Tworzenie folderu...';
-$labels['folderupdating'] = 'Aktualizowanie folderu...';
-$labels['foldermounting'] = 'Dodawanie przestrzeni zewnętrznej...';
+$labels['foldercreating'] = 'Utwórz folder...';
+$labels['folderupdating'] = 'Aktualizacja folderu...';
 $labels['folderdeleting'] = 'Usuwanie folderu...';
-$labels['folderdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
-$labels['folderdeletenotice'] = 'Folder został usunięty.';
-$labels['folderupdatenotice'] = 'Folder został zaktualizowany.';
-$labels['foldercreatenotice'] = 'Folder został utworzony.';
-$labels['foldermountnotice'] = 'Przestrzeń dodana pomyślnie.';
-$labels['saveallnotice'] = 'Pomyślnie zapisano $n plików.';
-$labels['saveallerror'] = 'Nie można zapisać $n plików.';
-$labels['attacherror'] = 'Nie udało się załączenie plików z chmury';
-$labels['fileupdating'] = 'Aktualizowanie pliku...';
-$labels['filemoving'] = 'Przenoszenie plików...';
-$labels['filecopying'] = 'Kopiowanie plików...';
-$labels['filedeleting'] = 'Usuwanie plików...';
-$labels['filedeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrane pliki?';
-$labels['filedeletenotice'] = 'Plik(i) zostały usunięte.';
-$labels['filemovenotice'] = 'Plik(i) zostały przeniesione.';
-$labels['filecopynotice'] = 'Plik(i) zostały skopiowane.';
-$labels['uploadsizeerror'] = 'Przekroczono maksymalny rozmiar pliku ($size)! ';
-$labels['allfolders'] = 'szukaj we wszystkich folderach';
-$labels['fileskip'] = 'Omiń';
-$labels['fileskipall'] = 'Omiń wszystkie';
+$labels['folderauthtitle'] = 'Zaloguj do $title';
+$labels['uploadsizeerror'] = 'Maksymalny rozmiar pliku ($size) przekroczony!';
+$labels['listpermanent'] = 'Dodaj do listy na stałe';
+$labels['fileskip'] = 'Pomiń';
+$labels['fileskipall'] = 'Pomiń wszystko';
 $labels['fileoverwrite'] = 'Nadpisz';
-$labels['fileoverwriteall'] = 'Nadpisz wszystkie';
-$labels['filemoveconfirm'] = 'Akcja ta nadpisze docelowy plik: <b>$file</b>.';
+$labels['fileoverwriteall'] = 'Nadpisz wszystko';
+$labels['select'] = 'Wybierz';
+$labels['participant'] = 'Uczestnik';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Dodaj uczestnika';
+$labels['invitationtextlabel'] = 'Komentarz zaproszenia/powiadomienia';
+$labels['statusorganizer'] = 'Organizator';
+$labels['removeparticipant'] = 'Usuń';
+$labels['owner'] = 'Właściciel';
+$labels['comment'] = 'Komentarz';
+$labels['open'] = 'Otwórz';
 $labels['storepasswords'] = 'zapamiętaj hasło';
-$labels['arialabelsearchform'] = 'Formularz wyszukiwania plików';
-$labels['arialabelquicksearchbox'] = 'Fraza wyszukiwania';
-$labels['arialabellistoptions'] = 'Opcje listy plików';
-$labels['arialabelfolderoptions'] = 'Akcje folderów';
-$labels['arialabelfileeditform'] = 'Formularz edycji pliku';
-$labels['arialabelfoldercreateform'] = 'Formularz tworzenia folderów';
-$labels['arialabelfoldereditform'] = 'Formularz edycji folderów';
-$labels['arialabelfoldermountform'] = 'Formularz zewnętrznego przechowywania';
-$labels['arialabelfolderlist'] = 'Wybór foldera/kolekcji';
-$labels['arialabelfileselectdialog'] = 'Okno wyboru pliku';
-$labels['arialabelattachmentoptions'] = 'Opcje zapisu załączników';
-$labels['arialabelfilesavedialog'] = 'Okno zapisu plików';
-$labels['arialabelfileprops'] = 'Właściwości pliku';
-$labels['arialabelfilecontent'] = 'Treść pliku';
-?>
+$labels['arialabelfileprops'] = 'Właściwości';
diff --git a/plugins/kolab_files/localization/pt_BR.inc b/plugins/kolab_files/localization/pt_BR.inc
index 99c936ca..fdf30d41 100644
--- a/plugins/kolab_files/localization/pt_BR.inc
+++ b/plugins/kolab_files/localization/pt_BR.inc
@@ -17,6 +17,7 @@ $labels['fromcloud'] = 'Da nuvem...';
 $labels['selectfiles'] = 'Selecione arquivo(s) para anexar...';
 $labels['attachsel'] = 'Anexar selecionado';
 $labels['foldercreate'] = 'Criar pasta';
+$labels['folderrename'] = 'Renomear pasta';
 $labels['folderdelete'] = 'Remover pasta';
 $labels['folderinside'] = 'Inserir dentro';
 $labels['foldername'] = 'Nome da pasta';
@@ -29,14 +30,16 @@ $labels['get'] = 'Baixar';
 $labels['getfile'] = 'Baixar arquivo';
 $labels['view'] = 'Visualizar';
 $labels['viewfile'] = 'Visualizar arquivo';
-$labels['rename'] = 'Renomear arquivo';
+$labels['rename'] = 'Renomear';
 $labels['deletefile'] = 'Remover arquivo(s)';
 $labels['edit'] = 'Editar';
 $labels['editfile'] = 'Editar arquivo';
 $labels['save'] = 'Salvar';
 $labels['savefile'] = 'Salvar arquivo';
 $labels['printfile'] = 'Imprimir arquivo';
-$labels['fileedit'] = 'Propriedades do arquivo';
+$labels['close'] = 'Fechar';
+$labels['submit'] = 'Enviar';
+$labels['confirmpassword'] = 'Confirmar senha';
 $labels['collection_audio'] = 'Áudio';
 $labels['collection_video'] = 'Vídeo';
 $labels['collection_image'] = 'Imagens';
@@ -60,11 +63,23 @@ $labels['filedeletenotice'] = 'Arquivo(s) removidos com sucesso.';
 $labels['filemovenotice'] = 'Arquivo(s) movidos com sucesso.';
 $labels['filecopynotice'] = 'Arquivo(s) copiados com sucesso.';
 $labels['uploadsizeerror'] = 'Limite máximo de tamanho de arquivo ($size) excedido!';
+$labels['listpermanent'] = 'Listar permanentemente';
 $labels['allfolders'] = 'pesquisar em todas as pastas';
 $labels['fileskip'] = 'Pular';
 $labels['fileskipall'] = 'Pular todos';
 $labels['fileoverwrite'] = 'Sobrescrever';
 $labels['fileoverwriteall'] = 'Sobrescrever todos';
 $labels['filemoveconfirm'] = 'Esta ação irá sobrescrever o arquivo de destino: <b>$file</b>.';
+$labels['select'] = 'Selecionar';
+$labels['participant'] = 'Participante';
+$labels['status'] = 'Situação';
+$labels['addparticipant'] = 'Adicionar participante';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizador';
+$labels['removeparticipant'] = 'Remover';
+$labels['accept'] = 'Aceitar';
+$labels['decline'] = 'Rejeitar';
+$labels['owner'] = 'Dono';
+$labels['comment'] = 'Comentário';
+$labels['open'] = 'Abrir';
 $labels['arialabelfileprops'] = 'Propriedades do arquivo';
-?>
diff --git a/plugins/kolab_files/localization/pt_PT.inc b/plugins/kolab_files/localization/pt_PT.inc
index 474ae133..226d378f 100644
--- a/plugins/kolab_files/localization/pt_PT.inc
+++ b/plugins/kolab_files/localization/pt_PT.inc
@@ -6,10 +6,19 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
+$labels['files'] = 'Ficheiros';
 $labels['save'] = 'Gravar';
 $labels['cancel'] = 'Cancelar';
 $labels['folderinside'] = 'Inserir dentro';
 $labels['name'] = 'Nome';
 $labels['edit'] = 'Editar';
 $labels['save'] = 'Gravar';
-?>
+$labels['listpermanent'] = 'Listar sempre';
+$labels['select'] = 'Selecionar';
+$labels['participant'] = 'Participante';
+$labels['status'] = 'Estado';
+$labels['addparticipant'] = 'Adicionar participante';
+$labels['invitationtextlabel'] = 'Observações — Convite/notificação';
+$labels['statusorganizer'] = 'Organizador';
+$labels['owner'] = 'Dono';
+$labels['comment'] = 'Comentário';
diff --git a/plugins/kolab_files/localization/ru_RU.inc b/plugins/kolab_files/localization/ru_RU.inc
index ae970903..0d423d9a 100644
--- a/plugins/kolab_files/localization/ru_RU.inc
+++ b/plugins/kolab_files/localization/ru_RU.inc
@@ -19,6 +19,7 @@ $labels['selectfiles'] = 'Выбрать файл(ы) для прикрепле
 $labels['attachsel'] = 'Прикрепить выбранные';
 $labels['foldercreate'] = 'Создать папку';
 $labels['folderedit'] = 'Редактировать папку';
+$labels['folderrename'] = 'Переименовать папку';
 $labels['foldermount'] = 'Добавить хранилище';
 $labels['folderdelete'] = 'Удалить папку';
 $labels['folderinside'] = 'Вставить внутрь';
@@ -32,18 +33,27 @@ $labels['get'] = 'Скачать';
 $labels['getfile'] = 'Скачать файл';
 $labels['view'] = 'Просмотреть';
 $labels['viewfile'] = 'Просмотреть файл';
-$labels['rename'] = 'Переименовать файл';
+$labels['rename'] = 'Переименовать';
 $labels['deletefile'] = 'Удалить файл(ы)';
 $labels['edit'] = 'Редактировать';
 $labels['editfile'] = 'Редактировать файл';
 $labels['save'] = 'Сохранить';
 $labels['savefile'] = 'Сохранить файл';
 $labels['printfile'] = 'Распечатать файл';
-$labels['fileedit'] = 'Свойства файла';
+$labels['renamefile'] = 'Переименовать файл';
+$labels['createfile'] = 'Создать файл';
+$labels['createandedit'] = 'Создать и редактировать';
+$labels['copyfile'] = 'Скопировать файл';
+$labels['copyandedit'] = 'Скопировать и редактировать';
+$labels['documenttitle'] = 'Заголовок:';
+$labels['close'] = 'Закрыть';
+$labels['submit'] = 'Отправить';
+$labels['confirmpassword'] = 'Повторите пароль';
 $labels['collection_audio'] = 'Аудио';
 $labels['collection_video'] = 'Видео';
 $labels['collection_image'] = 'Картинки';
 $labels['collection_document'] = 'Документы';
+$labels['sessions'] = 'Сессии';
 $labels['uploading'] = 'Закачиваются файлы...';
 $labels['attaching'] = 'Прикрепляются файлы...';
 $labels['authenticating'] = 'Аутентификация...';
@@ -61,6 +71,7 @@ $labels['saveallnotice'] = 'Успешно сохранены $n файл(ов).
 $labels['saveallerror'] = 'Сохранение $n файл(ов) не удалось.';
 $labels['attacherror'] = 'Не удалось прикрепить файл(ы) из облака';
 $labels['fileupdating'] = 'Обновляется файл...';
+$labels['filecreating'] = 'Создаётся файл...';
 $labels['filemoving'] = 'Перемещаются файлы...';
 $labels['filecopying'] = 'Копируются файлы...';
 $labels['filedeleting'] = 'Удаляются файлы...';
@@ -69,12 +80,58 @@ $labels['filedeletenotice'] = 'Файл(ы) удален(ы) успешно.';
 $labels['filemovenotice'] = 'Файл(ы) перемещен(ы) успешно.';
 $labels['filecopynotice'] = 'Файл(ы) скопирован(ы) успешно.';
 $labels['uploadsizeerror'] = 'Максимальный размер файла ($size) превышен!';
+$labels['listpermanent'] = 'Всегда показывать';
+$labels['additionalfolders'] = 'Дополнительные папки';
 $labels['allfolders'] = 'искать во всех папках';
 $labels['fileskip'] = 'Пропустить';
 $labels['fileskipall'] = 'Пропустить все';
 $labels['fileoverwrite'] = 'Перезаписать';
 $labels['fileoverwriteall'] = 'Перезаписать все';
 $labels['filemoveconfirm'] = 'Это действие перезапишет файл: <b>$file</b>.';
+$labels['editfiledialog'] = 'Подтвердить выполненные действия';
+$labels['newsession'] = 'Создать новую сессию';
+$labels['newsessionro'] = 'Создать новую сессию (скопировать файл в область для для редактирования)';
+$labels['ownedsession'] = 'Продолжить существующую сессию';
+$labels['invitedsession'] = 'Присоединиться к сессии $user';
+$labels['joinsession'] = 'Запросить приглашение от $user';
+$labels['editfilero'] = 'Этот файл доступен только для чтения. Хотите создать и отредактировать копию этого файла?';
+$labels['editfilerotitle'] = 'Файл только для чтения';
+$labels['select'] = 'Выбрать';
+$labels['terminatesession'] = 'Завершить сессию';
+$labels['sessionterminatedtitle'] = 'Сессия завершена';
+$labels['sessionterminated'] = 'Сессия была завершна. Это окно будет закрыто.';
+$labels['terminate'] = 'Завершить';
+$labels['sessionterminating'] = 'Сессия завершается...';
+$labels['unsavedchanges'] = 'Есть несохранённые изменения в документе, они будут потеряны. Вы действительно хотите завершить сессию?';
+$labels['manageeditors'] = 'Пригласить в документ';
+$labels['participant'] = 'Участник';
+$labels['status'] = 'Статус';
+$labels['addparticipant'] = 'Добавить участника';
+$labels['delparticipant'] = 'Удалить участника';
+$labels['invitationtexttitle'] = 'Комментарий будет прикреплен к приглашению/сообщению, отправленному участнику';
+$labels['invitationtextlabel'] = 'Комментарий к приглашению/извещению';
+$labels['statusorganizer'] = 'Организатор';
+$labels['statusinvited'] = 'Приглашенный';
+$labels['statusaccepted'] = 'Принято';
+$labels['statusdeclined'] = 'Отклонено';
+$labels['statusrequested'] = 'Запрошенный';
+$labels['removeparticipant'] = 'Убрать';
+$labels['invitednotice'] = 'Вы были приглашены $owner для совместного редактирования.';
+$labels['sessiondialog'] = 'Сессия редактирования документа';
+$labels['more'] = 'Больше.';
+$labels['accept'] = 'Принять';
+$labels['join'] = 'Присоединиться к сессии';
+$labels['decline'] = 'Отклонить';
+$labels['owner'] = 'Владелец';
+$labels['when'] = 'Когда';
+$labels['file'] = 'Файл';
+$labels['comment'] = 'Комментарий';
+$labels['open'] = 'Открыть';
+$labels['request'] = 'Запросить приглашение';
+$labels['invitationtitle'] = 'Приглашение в $file';
+$labels['invitationaccepting'] = 'Приглашение принимается...';
+$labels['invitationdeclining'] = 'Приглашение отклоняется...';
+$labels['invitationrequesting'] = 'Приглашение запрашивается...';
 $labels['storepasswords'] = 'запомнить пароль';
 $labels['storepasswordsdesc'] = 'Сохранённые пароли будут зашифрованы. Включите, если не хотите, чтобы пароль запрашивался при каждом входе, или если хотите, чтобы это хранилище было доступно через WebDAV.';
 $labels['arialabelsearchform'] = 'Искать файлы от';
@@ -82,6 +139,8 @@ $labels['arialabelquicksearchbox'] = 'Искать';
 $labels['arialabellistoptions'] = 'Настройки списка файлов';
 $labels['arialabelfolderoptions'] = 'Действия с папками';
 $labels['arialabelfileeditform'] = 'Форма изменения файла';
+$labels['arialabelfilecreateform'] = 'Форма создания файла';
+$labels['arialabelfilelist'] = 'Список файлов';
 $labels['arialabelfoldercreateform'] = 'Форма создания файла';
 $labels['arialabelfoldereditform'] = 'Форма редактирования папки';
 $labels['arialabelfoldermountform'] = 'Форма внешнего хранилища';
@@ -92,4 +151,8 @@ $labels['arialabelattachmentoptions'] = 'Настройки сохранения
 $labels['arialabelfilesavedialog'] = 'Диалог сохранения файлов';
 $labels['arialabelfileprops'] = 'Свойства файла';
 $labels['arialabelfilecontent'] = 'Содержимое файла';
-?>
+$labels['arialabelfileeditdialog'] = 'Диалог редактирования файла';
+$labels['arialabelfilesessiondialog'] = 'Сессия редактирования документа';
+$labels['type.plain'] = 'Простой текстовый файл';
+$labels['type.vndoasisopendocumenttext'] = 'Текстовый документ (ODF)';
+$labels['type.html'] = 'Документ HTML';
diff --git a/plugins/kolab_files/localization/sk_SK.inc b/plugins/kolab_files/localization/sk_SK.inc
new file mode 100644
index 00000000..2b7a0431
--- /dev/null
+++ b/plugins/kolab_files/localization/sk_SK.inc
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['save'] = 'Uložiť';
+$labels['cancel'] = 'Zrušiť';
+$labels['name'] = 'Meno';
+$labels['edit'] = 'Upraviť';
+$labels['save'] = 'Uložiť';
+$labels['select'] = 'Vybrať';
+$labels['status'] = 'Stav';
diff --git a/plugins/kolab_files/localization/sl_SI.inc b/plugins/kolab_files/localization/sl_SI.inc
new file mode 100644
index 00000000..9377985e
--- /dev/null
+++ b/plugins/kolab_files/localization/sl_SI.inc
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'Dokumenti';
+$labels['save'] = 'Shrani';
+$labels['cancel'] = 'Prekliči';
+$labels['folderinside'] = 'Vstavi';
+$labels['name'] = 'Ime';
+$labels['edit'] = 'Uredi';
+$labels['save'] = 'Shrani';
+$labels['listpermanent'] = 'Označi za vedno';
+$labels['select'] = 'Izberi';
+$labels['participant'] = 'Udeleženec';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Dodaj udeleženca';
+$labels['invitationtextlabel'] = 'Komentar vabila/obvestila';
+$labels['statusorganizer'] = 'Organizator';
+$labels['removeparticipant'] = 'Odstrani';
+$labels['owner'] = 'Lastnik';
+$labels['comment'] = 'Komentar';
diff --git a/plugins/kolab_files/localization/sv_SE.inc b/plugins/kolab_files/localization/sv_SE.inc
index 2936f5a7..ab01648d 100644
--- a/plugins/kolab_files/localization/sv_SE.inc
+++ b/plugins/kolab_files/localization/sv_SE.inc
@@ -7,89 +7,18 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Filer';
-$labels['filepreview'] = 'Förhandsgranska';
-$labels['saveall'] = 'Spara samtliga till moln ...';
-$labels['saveto'] = 'Spara till moln ...';
-$labels['saveas'] = 'Spara som:';
-$labels['create'] = 'Skapa';
 $labels['save'] = 'Spara';
 $labels['cancel'] = 'Avbryt';
-$labels['fromcloud'] = 'Från moln ...';
-$labels['selectfiles'] = 'Välj fil(er) att bifoga ...';
-$labels['attachsel'] = 'Bifoga vald(a)';
-$labels['foldercreate'] = 'Skapa mapp';
-$labels['folderedit'] = 'Redigera mapp';
-$labels['foldermount'] = 'Lägg till lagring';
-$labels['folderdelete'] = 'Ta bort mapp';
 $labels['folderinside'] = 'Infoga inuti';
-$labels['foldername'] = 'Mappnamn';
 $labels['name'] = 'Namn';
-$labels['mtime'] = 'Ändrad';
-$labels['type'] = 'Typ';
-$labels['upload'] = 'Ladda upp';
-$labels['uploadfile'] = 'Ladda upp fil(er)';
-$labels['get'] = 'Ladda ner';
-$labels['getfile'] = 'Ladda ner fil';
-$labels['view'] = 'Visa';
-$labels['viewfile'] = 'Visa fil';
-$labels['rename'] = 'Byt namn på fil';
-$labels['deletefile'] = 'Ta bort fil(er)';
 $labels['edit'] = 'Redigera';
-$labels['editfile'] = 'Redigera fil';
 $labels['save'] = 'Spara';
-$labels['savefile'] = 'Spara fil';
-$labels['printfile'] = 'Skriv ut fil';
-$labels['fileedit'] = 'Filegenskaper';
-$labels['collection_audio'] = 'Audio';
-$labels['collection_video'] = 'Video';
-$labels['collection_image'] = 'Bilder';
-$labels['collection_document'] = 'Dokument';
-$labels['uploading'] = 'Laddar upp fil(er) ...';
-$labels['attaching'] = 'Bifogar fil(er) ...';
-$labels['authenticating'] = 'Autentiserar ...';
-$labels['foldercreating'] = 'Skapar mapp ...';
-$labels['folderupdating'] = 'Uppdaterar mapp ...';
-$labels['foldermounting'] = 'Lägger till extern lagring ...';
-$labels['folderdeleting'] = 'Tar bort mapp ...';
-$labels['folderdeleteconfirm'] = 'Vill du verkligen ta bort vald mapp?';
-$labels['folderdeletenotice'] = 'Mapp borttagen.';
-$labels['folderupdatenotice'] = 'Mapp uppdaterad.';
-$labels['foldercreatenotice'] = 'Mapp skapad.';
-$labels['foldermountnotice'] = 'Lagring lades till.';
-$labels['folderauthtitle'] = 'Logga in på';
-$labels['saveallnotice'] = 'Sparade $n fil(er).';
-$labels['saveallerror'] = 'Sparar $n fil(er) misslyckades.';
-$labels['attacherror'] = 'Misslyckades att bifoga fil(er) från molnet';
-$labels['fileupdating'] = 'Uppdaterar fil ...';
-$labels['filemoving'] = 'Flyttar fil(er) ...';
-$labels['filecopying'] = 'Kopierar fil(er) ...';
-$labels['filedeleting'] = 'Tar bort fil(er) ...';
-$labels['filedeleteconfirm'] = 'Vill du verkligen ta bort valda filer?';
-$labels['filedeletenotice'] = 'Fil(er) borttagna.';
-$labels['filemovenotice'] = 'Fil(er) flyttade.';
-$labels['filecopynotice'] = 'Fil(er) kopierade.';
-$labels['uploadsizeerror'] = 'Maximal filstorlek ($size) överskriden!';
-$labels['allfolders'] = 'sök i alla mappar';
-$labels['fileskip'] = 'Hoppa över';
-$labels['fileskipall'] = 'Hoppa över alla';
-$labels['fileoverwrite'] = 'Skriv över';
-$labels['fileoverwriteall'] = 'Skriv över alla';
-$labels['filemoveconfirm'] = 'Denna åtgärd kommer att skriva över målfilen: <b>$file</b>.';
-$labels['storepasswords'] = 'kom ihåg lösenord';
-$labels['storepasswordsdesc'] = 'Lagrade lösenord kommer att krypteras. Aktivera det här om du inte vill bli tillfrågad om lösenordet vid varje inloggning eller om du vill att denna lagring ska vara tillgänglig via WebDAV.';
-$labels['arialabelsearchform'] = 'Sökformulär för filer';
-$labels['arialabelquicksearchbox'] = 'Sökinmatning';
-$labels['arialabellistoptions'] = 'Fillistningsval';
-$labels['arialabelfolderoptions'] = 'Mappåtgärd';
-$labels['arialabelfileeditform'] = 'Filredigeringsformulär';
-$labels['arialabelfoldercreateform'] = 'Formulär för skapa-mapp';
-$labels['arialabelfoldereditform'] = 'Formulär för mappredigering';
-$labels['arialabelfoldermountform'] = 'Formulär för extern lagring';
-$labels['arialabelfolderauthform'] = 'Autentiseringsformulär för extern lagring';
-$labels['arialabelfolderlist'] = 'Mapp-/samlingsurval';
-$labels['arialabelfileselectdialog'] = 'Filurvalsdialog';
-$labels['arialabelattachmentoptions'] = 'Alternativ för att spara bilagor';
-$labels['arialabelfilesavedialog'] = 'Dialog för atta spara fil(er)';
-$labels['arialabelfileprops'] = 'Filegenskaper';
-$labels['arialabelfilecontent'] = 'Filinnehåll';
-?>
+$labels['listpermanent'] = 'Lista permanent';
+$labels['select'] = 'Välj';
+$labels['participant'] = 'Deltagare';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Lägg till deltagare';
+$labels['invitationtextlabel'] = 'Kommentar till inbjudan/meddelande';
+$labels['statusorganizer'] = 'Organisatör';
+$labels['owner'] = 'Ägare';
+$labels['comment'] = 'Kommentar';
diff --git a/plugins/kolab_files/localization/th_TH.inc b/plugins/kolab_files/localization/th_TH.inc
new file mode 100644
index 00000000..8fb21075
--- /dev/null
+++ b/plugins/kolab_files/localization/th_TH.inc
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'ไฟล์';
+$labels['filepreview'] = 'ดูไฟล์ก่อน';
+$labels['saveall'] = 'บันทึกทั้งหมดไปบนคลาวน์';
+$labels['saveto'] = 'บันทึกไปบนคลาวน์';
+$labels['saveas'] = 'บันทึกเป็น';
+$labels['create'] = 'สร้าง';
+$labels['save'] = 'บันทึก';
+$labels['cancel'] = 'ยกเลิก';
+$labels['fromcloud'] = 'จากคลาวน์';
+$labels['selectfiles'] = 'เลือกไฟล์ที่จะแนบ';
+$labels['foldercreate'] = 'สร้างแฟ้ม';
+$labels['folderedit'] = 'แก้ไขแฟ้ม';
+$labels['foldermount'] = 'เพิ่มพื้นที่จัดเก็บ';
+$labels['folderdelete'] = 'ลบแฟ้ม';
+$labels['folderinside'] = 'ใส่เข้าภายใต้';
+$labels['foldername'] = 'ชื่อแฟ้ม';
+$labels['name'] = 'ชื่อ';
+$labels['mtime'] = 'แก้ไข';
+$labels['type'] = 'ชนิด';
+$labels['upload'] = 'นำขึ้น';
+$labels['uploadfile'] = 'นำขึ้นไฟล์';
+$labels['get'] = 'นำกลับ';
+$labels['getfile'] = 'นำกลับไฟล์';
+$labels['view'] = 'มุมมอง';
+$labels['viewfile'] = 'ดูไฟล์';
+$labels['rename'] = 'เปลี่ยนชื่อ';
+$labels['deletefile'] = 'ลบไฟล์';
+$labels['edit'] = 'แก้ไข';
+$labels['editfile'] = 'แก้ไขไฟล์';
+$labels['save'] = 'บันทึก';
+$labels['savefile'] = 'บันทึกไฟล์';
+$labels['printfile'] = 'พิมพ์ไฟล์';
+$labels['close'] = 'ปิด';
+$labels['submit'] = 'ส่งเข้าระบบ';
+$labels['collection_audio'] = 'เสียง';
+$labels['collection_video'] = 'วีดีโอ';
+$labels['collection_image'] = 'ภาพ';
+$labels['collection_document'] = 'เอกสาร';
+$labels['uploading'] = 'กำลังอัพโหลดไฟล์...';
+$labels['attaching'] = 'กำลังแนบไฟล์...';
+$labels['authenticating'] = 'กำลังพิสูจน์ตัวตน...';
+$labels['foldercreating'] = 'กำลังสร้างแฟ้ม...';
+$labels['folderupdating'] = 'กำลังปรับปรุงแฟ้ม...';
+$labels['foldermounting'] = 'กำลังเพิ่มพื้นที่จัดเก็บภายนอก...';
+$labels['folderdeleting'] = 'กำลังลบแฟ้ม...';
+$labels['folderdeleteconfirm'] = 'คุณแน่ใจว่าคุณต้องการลบแฟ้มที่เลือกนี้หรือ';
+$labels['folderdeletenotice'] = 'แฟ้มถูกลบเรียบร้อยแล้ว';
+$labels['folderupdatenotice'] = 'แฟ้มถูกปรับปรุงเรียบร้อยแล้ว';
+$labels['foldercreatenotice'] = 'แฟ้มถูกสร้างเรียบร้อยแล้ว';
+$labels['foldermountnotice'] = 'พื้นที่จัดเก็บถูกเพิ่มเรียบร้อยแล้ว';
+$labels['saveallnotice'] = 'บันทึกไฟล์จำนวน $n ไฟล์ เรียบร้อยแล้ว';
+$labels['saveallerror'] = 'บันทึกไฟล์จำนวน $n ไฟล์ ล้มเหลว';
+$labels['attacherror'] = 'การแนบไฟล์จากคลาวน์ล้มเหลว';
+$labels['fileupdating'] = 'กำลังปรับปรุงไฟล์...';
+$labels['filemoving'] = 'กำลังเคลื่อนย้ายไฟล์...';
+$labels['filecopying'] = 'กำลังคัดลอกไฟล์...';
+$labels['filedeleting'] = 'กำลังลบไฟล์...';
+$labels['filedeleteconfirm'] = 'คุณแน่ใจว่าคุณต้องการลบไฟล์ที่ถูกเลือกหรือ';
+$labels['filedeletenotice'] = 'ไฟล์ถูกลบเรียบร้อยแล้ว';
+$labels['filemovenotice'] = 'ไฟล์ถูกเคลื่อนย้ายเรียบร้อยแล้ว';
+$labels['filecopynotice'] = 'ไฟล์ถูกคัดลอกเรียบร้อยแล้ว';
+$labels['uploadsizeerror'] = 'ไฟล์มีขนาดเกินกว่าขนาดสูงสุด ($size)';
+$labels['listpermanent'] = 'แสดงเป็นรายการถาวร';
+$labels['allfolders'] = 'ค้นหาในทุกแฟ้ม';
+$labels['fileskip'] = 'ข้าม';
+$labels['fileskipall'] = 'ข้ามทั้งหมด';
+$labels['fileoverwrite'] = 'เขียนทับ';
+$labels['fileoverwriteall'] = 'เขียนทับทั้งหมด';
+$labels['filemoveconfirm'] = 'การดำเนินการนี้จะเขียนทับไฟล์ที่ปลายทาง <b>$file</b>';
+$labels['select'] = 'เลือก';
+$labels['participant'] = 'ผู้เข้าร่วม';
+$labels['status'] = 'สถานะ';
+$labels['addparticipant'] = 'เพิ่มผู้เข้าร่วม';
+$labels['invitationtextlabel'] = 'ความคิดเห็น คำเชิญ/คำแจ้งเตือน';
+$labels['statusorganizer'] = 'ผู้จัดงาน';
+$labels['removeparticipant'] = 'ลบ';
+$labels['accept'] = 'ยอมรับ';
+$labels['decline'] = 'ปฎิเสธ';
+$labels['owner'] = 'เจ้าของ';
+$labels['comment'] = 'ความคิดเห็น';
+$labels['open'] = 'เปิด';
+$labels['storepasswords'] = 'จดจำรหัสผ่าน';
+$labels['storepasswordsdesc'] = 'พาสเวิสด์ที่จัดเก็บจะถูกเข้ารหัส  เปิดใช้สิ่งนี้หากคุณไม่ต้องการถูกถามพาสเวิสด์ทุกครั้งที่เข้าระบบ หรือ หากคุณต้องการให้พื้นที่จัดเก็บเข้าถึงได้จาก WebDAV';
+$labels['arialabelsearchform'] = 'ฟอร์มค้นหาไฟล์';
+$labels['arialabelquicksearchbox'] = 'ข้อมูลที่ต้องการค้นหา';
+$labels['arialabellistoptions'] = 'ทางเลือกรายชื่อไฟล์';
+$labels['arialabelfileeditform'] = 'ฟอร์มแก้ไขไฟล์';
+$labels['arialabelfoldercreateform'] = 'ฟอร์มสร้างแฟ้ม';
+$labels['arialabelfoldereditform'] = 'ฟอร์มแก้ไขแฟ้ม';
+$labels['arialabelfoldermountform'] = 'ฟอร์มพื้นที่จัดเก็บภายนอก';
+$labels['arialabelfolderauthform'] = 'ฟอร์มยืนยันตัวตนสำหรับพื้นที่จัดเก็บภายนอก';
+$labels['arialabelattachmentoptions'] = 'ทางเลือกของการบันทึกสิ่งที่แนบมาด้วย';
+$labels['arialabelfilesavedialog'] = 'dialog สำหรับการบันทึกไฟล์';
+$labels['arialabelfileprops'] = 'คุณสมบัติของไฟล์';
+$labels['arialabelfilecontent'] = 'เนื้อหาในไฟล์';
diff --git a/plugins/kolab_files/localization/uk_UA.inc b/plugins/kolab_files/localization/uk_UA.inc
new file mode 100644
index 00000000..ac64ef16
--- /dev/null
+++ b/plugins/kolab_files/localization/uk_UA.inc
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'Файли';
+$labels['create'] = 'Створити';
+$labels['save'] = 'Зберегти';
+$labels['cancel'] = 'Відмінити';
+$labels['folderinside'] = 'Вставити всередину';
+$labels['name'] = 'Назва';
+$labels['edit'] = 'Редагувати';
+$labels['save'] = 'Зберегти';
+$labels['listpermanent'] = 'Завжди показувати';
+$labels['select'] = 'Вибрати';
+$labels['participant'] = 'Учасний';
+$labels['status'] = 'Статус';
+$labels['addparticipant'] = 'Додати учасника';
+$labels['invitationtextlabel'] = 'Коментар до запрошення/повідомлення';
+$labels['statusorganizer'] = 'Організатор';
+$labels['owner'] = 'Власник';
+$labels['comment'] = 'Коментарій';
diff --git a/plugins/kolab_files/localization/vi_VN.inc b/plugins/kolab_files/localization/vi_VN.inc
new file mode 100644
index 00000000..8bc29ad1
--- /dev/null
+++ b/plugins/kolab_files/localization/vi_VN.inc
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['listpermanent'] = 'List permanently';
+$labels['select'] = 'Select';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Add participant';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizer';
+$labels['owner'] = 'Owner';
+$labels['comment'] = 'Comment';
diff --git a/plugins/kolab_files/localization/zh_CN.inc b/plugins/kolab_files/localization/zh_CN.inc
index eb4c6cf1..94f00c05 100644
--- a/plugins/kolab_files/localization/zh_CN.inc
+++ b/plugins/kolab_files/localization/zh_CN.inc
@@ -6,9 +6,33 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
+$labels['files'] = '文件';
+$labels['filepreview'] = '文件预览';
+$labels['create'] = '创建';
 $labels['save'] = '保存';
 $labels['cancel'] = '取消';
+$labels['foldercreate'] = '创建文件夹';
+$labels['foldername'] = '文件夹名';
 $labels['name'] = '名称';
+$labels['type'] = '类型';
+$labels['upload'] = '上传';
+$labels['get'] = '下载';
+$labels['rename'] = '重命名';
 $labels['edit'] = '编辑';
 $labels['save'] = '保存';
-?>
+$labels['close'] = '关闭';
+$labels['submit'] = '提交';
+$labels['collection_audio'] = '声音';
+$labels['collection_video'] = '视频';
+$labels['collection_image'] = '图片';
+$labels['collection_document'] = '文档';
+$labels['fileskip'] = '略过';
+$labels['fileskipall'] = '忽略全部';
+$labels['select'] = '选择';
+$labels['participant'] = '参与者';
+$labels['status'] = '状态';
+$labels['addparticipant'] = '添加参与者';
+$labels['statusorganizer'] = '组织者';
+$labels['comment'] = '注释';
+$labels['open'] = '打开';
+$labels['storepasswords'] = '记住密码';
diff --git a/plugins/kolab_files/localization/zh_TW.inc b/plugins/kolab_files/localization/zh_TW.inc
new file mode 100644
index 00000000..8bc29ad1
--- /dev/null
+++ b/plugins/kolab_files/localization/zh_TW.inc
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['listpermanent'] = 'List permanently';
+$labels['select'] = 'Select';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Add participant';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizer';
+$labels['owner'] = 'Owner';
+$labels['comment'] = 'Comment';
diff --git a/plugins/kolab_files/skins/elastic/templates/compose_plugin.html b/plugins/kolab_files/skins/elastic/templates/compose_plugin.html
new file mode 100644
index 00000000..28f99d2d
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/templates/compose_plugin.html
@@ -0,0 +1,43 @@
+<div id="files-compose-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-fileselect">
+	<h3 id="aria-label-fileselect" class="voice"><roundcube:label name="kolab_files.arialabelfileselectdialog" /></h3>
+	<div id="folderlistbox" class="selection-list" role="navigation" aria-labelledby="aria-label-folderlist">
+		<h4 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h4>
+		<div class="header">
+			<a class="button icon back" href="#back" data-hidden="big" onclick="$('#folderlistbox').hide();$('#filelistcontainer').css('display','flex')"><span class="inner"><roundcube:label name="back" /></span></a>
+			<span class="header-title"><roundcube:label name="folders" /></span>
+		</div>
+		<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+			ariatag="h5" label="foldersearchform" buttontitle="kolab_files.findfolders" />
+		<div id="files-folder-list" class="scroller"></div>
+	</div>
+	<div id="filelistcontainer" class="selection-content content">
+		<div class="header">
+			<a class="button icon folders" href="#sidebar" data-hidden="big" onclick="$('#filelistcontainer').hide();$('#folderlistbox').css('display','flex')"><span class="inner"><roundcube:label name="folders" /></span></a>
+			<span class="header-title" data-hidden="big" ><roundcube:label name="kolab_files.selectfiles" /></span>
+		</div>
+		<roundcube:object name="file-search-form" id="filesearchbox" wrapper="searchbar toolbar"
+			label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
+			ariatag="h3" options="filesearchmenu" />
+		<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">
+			<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
+			<div class="formcontent">
+				<ul class="proplist">
+					<li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /><roundcube:label name="kolab_files.allfolders" /></label></li>
+				</ul>
+			</div>
+			<div class="formbuttons">
+				<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('files-search')"><roundcube:label name="search" /></button>
+			</div>
+		</div>
+		<h4 id="aria-label-filelist" class="voice"><roundcube:label name="kolab_files.arialabelfilelist" /></h4>
+		<div class="scroller">
+			<roundcube:object name="filelist" id="filelist" class="records-table filelist listing sortheader fixedheader"
+				aria-labelledby="aria-label-filelist" data-list="fileslist" data-label-msg="listempty" />
+		</div>
+	</div>
+</div>
+
+<div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
+	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
+	<roundcube:object name="folder-auth-options">
+</div>
diff --git a/plugins/kolab_files/skins/elastic/templates/docedit.html b/plugins/kolab_files/skins/elastic/templates/docedit.html
new file mode 100644
index 00000000..e241c8e5
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/templates/docedit.html
@@ -0,0 +1,72 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:filename" /></h1>
+
+<div class="content selected editor-<roundcube:var name="env:editor_type" />">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header document-editor-header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon members" href="#members" onclick="kolab_files_members_list(this)" data-hidden="big">
+			<span class="inner"><roundcube:label name="kolab_files.arialabelcollaborators"></span>
+		</a>
+		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
+		<div class="toolbar">
+			<roundcube:button command="document-close" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="kolab_files.terminate" title="kolab_files.terminatesession" innerClass="inner" />
+			<span class="dropbutton">
+				<roundcube:button command="document-export" type="link"
+					class="button export disabled" classAct="button export"
+					label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
+				<a href="#export" class="button dropdown" id="exportmenulink" data-popup="export-menu" tabindex="0">
+					<span class="inner"><roundcubemail:label name="kolab_files.exportoptions" /><span>
+				</a>
+			</span>
+			<roundcube:if condition="env:editor_type == 'wopi'" />
+				<roundcube:button command="document-print" type="link"
+					class="button print disabled" classAct="button print"
+					label="print" title="kolab_files.printfile" innerClass="inner" data-hidden="small" />
+			<roundcube:endif />
+			<roundcube:button command="document-save" type="link"
+				class="button save disabled" classAct="button save"
+				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" data-hidden="small" />
+		</div>
+		<roundcube:if condition="env:editor_type != 'wopi'" />
+			<div id="doc-title" data-hidden="small">
+				<label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" class="form-control" /></label>
+			</div>
+		<roundcube:endif />
+		<div id="collaborators" role="toolbar" aria-labelledby="aria-label-collaborators" data-hidden="small">
+			<h3 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h3>
+			<roundcube:button command="document-editors" type="link"
+				class="button add disabled" classAct="button add"
+				label="kolab_files.manageeditors" title="kolab_files.manageeditors" innerClass="inner" />
+			<div id="members" class="session-members"></div>
+		</div>
+	</div>
+	<h2 id="aria-label-filecontent" class="voice"><roundcube:label name="kolab_files.arialabelfilecontent" /></h2>
+	<div class="iframe-wrapper">
+		<roundcube:object name="filepreviewframe" id="fileframe" role="main"
+			title="kolab_files.arialabelfilecontent" aria-labelledby="aria-label-filecontent" />
+	</div>
+	<div class="footer toolbar hidden-big">
+		<roundcube:button command="document-save" type="link"
+			class="button save disabled" classAct="button save"
+			label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" />
+		<roundcube:button name="close-window" type="link" onclick="parent.$('.ui-dialog:visible button.cancel').click()"
+			class="button cancel" label="cancel" title="cancel" innerClass="inner" />
+	</div>
+</div>
+
+<div id="export-menu" class="popupmenu">
+	<h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
+	<ul id="exportmenu-menu" class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
+</div>
+
+<div id="document-editors-dialog" class="popupmenu editors-dialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog">
+	<h3 id="aria-label-doceditorsdialog" class="voice"><roundcube:label name="kolab_files.arialabeldoceditorsdialog" /></h3>
+	<roundcube:object name="document-editors-dialog" class="records-table table no-img" />
+</div>
+
+<script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_files/skins/elastic/templates/filepreview.html b/plugins/kolab_files/skins/elastic/templates/filepreview.html
new file mode 100644
index 00000000..5ec0f30e
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/templates/filepreview.html
@@ -0,0 +1,89 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:filename" /></h1>
+
+<div class="sidebar listbox">
+	<div class="header">
+		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="fileinfobox" id="fileinfo" class="listing props-table" />
+	</div>
+</div>
+
+<div class="content selected">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
+			<span class="inner"><roundcube:label name="properties"></span>
+		</a>
+		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
+		<div id="filetoolbar" class="toolbar">
+			<roundcube:button command="files-get" type="link"
+				class="button download disabled" classAct="button download"
+				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
+			<roundcube:button command="files-edit" type="link"
+				class="button edit disabled" classAct="button edit"
+				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" data-hidden="small" />
+			<roundcube:button command="files-save" type="link"
+				class="button save disabled" classAct="button save"
+				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" style="display:none" data-hidden="small" />
+			<roundcube:button command="files-delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_files.deletefile" innerClass="inner" />
+			<roundcube:button command="files-print" type="link"
+				class="button print disabled" classAct="button print"
+				label="print" title="kolab_files.printfile" innerClass="inner" data-hidden="small" />
+			<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
+				<roundcube:button command="image-scale" type="link" prop="+" data-hidden="small"
+					class="button zoomin disabled" classAct="button zoomin"
+					label="zoomin" title="increaseimage" innerclass="inner" />
+				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
+					class="button zoomout disabled" classAct="button zoomout"
+					label="zoomout" title="decreaseimage" innerclass="inner" />
+				<roundcube:button command="image-rotate" type="link"
+					class="button rotate disabled" classAct="button rotate" data-hidden="small"
+					label="rotate" title="rotateimage" innerclass="inner" />
+			<roundcube:endif />
+		</div>
+	</div>
+	<h2 id="aria-label-filecontent" class="voice"><roundcube:label name="kolab_files.arialabelfilecontent" /></h2>
+	<div class="iframe-wrapper file-type-<roundcube:exp expression="strtolower(preg_replace('|/.*$|', '', env:mimetype))" />">
+		<roundcube:object name="filepreviewframe" id="fileframe" role="main" aria-labelledby="aria-label-filecontent" />
+	</div>
+<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
+	<div id="image-tools" class="image-tools" data-hidden="big">
+		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
+		<div class="toolbar" role="menu" aria-labelledby="aria-label-imagetools">
+			<roundcube:button command="image-scale" type="link" prop="+"
+				class="button zoomin disabled" classAct="button zoomin"
+				label="zoomin" title="increaseimage" innerclass="inner" />
+			<roundcube:button command="image-scale" type="link" prop="-"
+				class="button zoomout disabled" classAct="button zoomout"
+				label="zoomout" title="decreaseimage" innerclass="inner" />
+			<roundcube:button command="image-rotate" type="link"
+				class="button rotate disabled" classAct="button rotate"
+				label="rotate" title="rotateimage" innerclass="inner" />
+		</div>
+		<a href="#" class="button icon tools" onclick="$(this).attr('title', $(this).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')))"
+			data-label-show="<roundcube:label name="showtools" />" data-label-hide="<roundcube:label name="hidetools" />" title="<roundcube:label name="showtools" />">
+			<span class="inner"><roundcube:label name="showtools" /></span>
+		</a>
+	</div>
+<roundcube:endif />
+</div>
+
+<div id="files-file-create-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
+	<h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+	<roundcube:object name="file-create-form" />
+</div>
+
+<div id="files-file-edit-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-fileeditdialog" aria-hidden="true">
+	<h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+	<roundcube:object name="file-edit-dialog">
+</div>
+
+<script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_files/skins/elastic/templates/files.html b/plugins/kolab_files/skins/elastic/templates/files.html
new file mode 100644
index 00000000..92730ba6
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/templates/files.html
@@ -0,0 +1,219 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_files.files" /></h1>
+
+<!-- folders list -->
+<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-folders">
+	<div class="header">
+		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span id="aria-label-folders" class="header-title"><roundcube:label name="folders" /></span>
+		<roundcube:button name="folderoptions" id="folderoptionslink" type="link"
+			title="moreactions" label="actions"
+			class="button icon sidebar-menu" innerClass="inner" data-popup="folderoptions" />
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
+	<div id="files-folder-list" class="scroller"></div>
+<roundcube:if condition="env:files_quota" />
+	<div class="footer toolbar small">
+		<div id="quotadisplay" class="quota-widget">
+			<span class="voice"><roundcube:label name="quota"></span>
+			<roundcube:object name="filequotadisplay" class="count" display="text" />
+		</div>
+	</div>
+<roundcube:endif />
+</div>
+
+<!-- files -->
+<div class="content selected no-navbar" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="folders" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div id="filestoolbar" class="toolbar">
+			<roundcube:button id="fileslistmenu-link" name="fileslistmenu-link"
+				type="link" onclick="kolab_files_listoptions('files')"
+				label="options" class="button settings" innerClass="inner" />
+			<roundcube:button id="sessionslistmenu-link" name="sessionslistmenu-link"
+				type="link" onclick="kolab_files_listoptions('sessions')"
+				label="options" class="button hidden settings" innerClass="inner" />
+			<span class="spacer"></span>
+			<roundcube:button command="files-upload" type="link" onclick="$('#filesuploadform').click()"
+				class="button upload disabled" classAct="button upload"
+				label="kolab_files.upload" title="kolab_files.uploadfile" innerClass="inner" />
+			<roundcube:button command="files-get" type="link"
+				class="button download disabled" classAct="button download"
+				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
+			<roundcube:button command="files-open" type="link"
+				class="button open disabled" classAct="button open"
+				label="kolab_files.view" title="kolab_files.viewfile" innerClass="inner" />
+			<roundcube:button command="files-edit" type="link"
+				class="button edit disabled" classAct="button edit"
+				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" />
+			<roundcube:button command="files-create" type="link" data-fab="true"
+				class="button create disabled" classAct="button create"
+				label="kolab_files.create" title="kolab_files.createfile" innerClass="inner "/>
+			<roundcube:button command="files-delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_files.deletefile" innerClass="inner" />
+			<roundcube:button name="filemenulink" id="filemenulink" type="link"
+				class="button more" label="more" title="moreactions"
+				data-popup="file-menu" innerclass="inner" />
+		</div>
+	</div>
+	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar toolbar"
+		label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
+		ariatag="h3" options="filesearchmenu" />
+	<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">
+		<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
+		<div class="formcontent">
+			<ul class="proplist">
+				<li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /><roundcube:label name="kolab_files.allfolders" /></label></li>
+			</ul>
+		</div>
+		<div class="formbuttons">
+			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('files-search')"><roundcube:label name="search" /></button>
+		</div>
+	</div>
+	<div id="filelistcontainer" class="content" role="main" aria-labelledby="aria-label-filelist" data-elastic-mode="true">
+		<h2 id="aria-label-filelist" class="voice"><roundcube:label name="kolab_files.arialabelfilelist" /></h2>
+		<div id="filelistbox" class="droptarget">
+			<roundcube:object name="filelist" id="filelist" class="records-table listing filelist sortheader fixedheader"
+				aria-labelledby="aria-label-filelist" data-list="fileslist"
+				data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="files-create" />
+		</div>
+		<h2 id="aria-label-sessionslist" class="voice"><roundcube:label name="kolab_files.arialabelsessionslist" /></h2>
+		<div id="sessionslistbox" class="boxlistcontent" style="display:none">
+		<roundcube:object name="sessionslist" id="sessionslist" class="records-table listing filelist sortheader fixedheader"
+			optionsmenuIcon="true" aria-labelledby="aria-label-sessionslist" data-label-msg="listempty" />
+		</div>
+	</div>
+</div>
+
+<form id="filesuploadform" class="smart-upload"></form>
+
+<div id="files-folder-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldercreateform">
+	<h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
+	<roundcube:object name="folder-create-form" />
+</div>
+<div id="files-folder-edit-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldereditform">
+	<h3 id="aria-label-foldereditform" class="voice"><roundcube:label name="kolab_files.arialabelfoldereditform" /></h3>
+	<roundcube:object name="folder-edit-form" />
+</div>
+<div id="files-folder-mount-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldermountform">
+	<h3 id="aria-label-foldermountform" class="voice"><roundcube:label name="kolab_files.arialabelfoldermountform" /></h3>
+	<roundcube:object name="folder-mount-form" />
+</div>
+<div id="files-file-rename-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filerenameform">
+	<h3 id="aria-label-filerenameform" class="voice"><roundcube:label name="kolab_files.arialabelfilerenameform" /></h3>
+	<roundcube:object name="file-rename-form" />
+</div>
+<div id="files-file-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filecreateform">
+	<h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+	<roundcube:object name="file-create-form" />
+</div>
+<div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
+	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
+	<roundcube:object name="folder-auth-options" />
+</div>
+<div id="files-file-edit-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-fileeditdialog">
+	<h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+	<roundcube:object name="file-edit-dialog" />
+</div>
+<div id="files-session-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filesessiondialog">
+	<h3 id="aria-label-filesessiondialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesessiondialog" /></h3>
+	<roundcube:object name="file-session-dialog" />
+</div>
+
+<div id="folderoptions" class="popupmenu" data-editable="true">
+	<h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-folderoptions">
+		<roundcube:button type="link-menuitem" command="folder-create" label="kolab_files.addfolder" class="create disabled" classAct="create active" />
+		<roundcube:button type="link-menuitem" command="folder-rename" label="kolab_files.folderrename" class="rename" classAct="rename active" />
+		<roundcube:if condition="env:files_api_version &gt; 3" />
+			<roundcube:button type="link-menuitem" command="folder-share" label="kolab_files.foldershare" class="share" classAct="share active" />
+		<roundcube:endif />
+		<roundcube:button type="link-menuitem" command="files-folder-delete" label="kolab_files.folderdelete" class="delete" classAct="delete active" />
+		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders" classAct="folders active" />
+		<roundcube:if condition="!empty(env:external_sources)" />
+			<roundcube:button type="link-menuitem" command="folder-mount" label="kolab_files.foldermount" class="mount storage" classAct="mount storage active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<roundcube:add_label name="kolab_files.arialabellistoptions" />
+<div id="fileslistoptions" class="propform popupmenu" role="dialog" aria-labelledby="aria-label-fileslistoptions">
+	<h3 id="aria-label-fileslistoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
+	<roundcube:if condition="!in_array('kolab_files_sort_col', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select name="sort_col" class="form-control">
+				<option value="name"><roundcube:label name="kolab_files.name" /></option>
+				<option value="mtime"><roundcube:label name="kolab_files.mtime" /></option>
+				<option value="size"><roundcube:label name="size" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+	<roundcube:if condition="!in_array('kolab_files_sort_order', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select class="form-control">
+				<option value="ASC"><roundcube:label name="asc" /></option>
+				<option value="DESC"><roundcube:label name="desc" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+</div>
+
+<roundcube:add_label name="kolab_files.arialabelsessionslistoptions" />
+<div id="sessionslistoptions" class="propform popupmenu" role="dialog" aria-labelledby="aria-label-sessionslistoptions">
+	<h3 id="aria-label-sessionslistoptions" class="voice"><roundcube:label name="kolab_files.arialabelsessionslistoptions" /></h3>
+	<roundcube:if condition="!in_array('kolab_files_sessions_sort_col', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select name="sort_col" class="form-control">
+				<option value="name"><roundcube:label name="kolab_files.name" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+	<roundcube:if condition="!in_array('kolab_files_sessions_sort_order', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select class="form-control">
+				<option value="ASC"><roundcube:label name="asc" /></option>
+				<option value="DESC"><roundcube:label name="desc" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+</div>
+
+<div id="dragfilemenu" class="popupmenu">
+	<ul class="toolbarmenu listing" role="menu">
+		<roundcube:button type="link-menuitem" command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" />
+		<roundcube:button type="link-menuitem" command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" />
+	</ul>
+</div>
+
+<div id="file-menu" class="popupmenu">
+	<h3 id="aria-label-message-menu" class="voice"><roundcube:label name="kolab_files.arialabelmorefileactions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-file-menu">
+		<roundcube:button type="link-menuitem" command="files-rename" label="kolab_files.rename" class="rename" classAct="rename active" />
+		<roundcube:button type="link-menuitem" command="files-move" label="moveto" class="move" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
+		<roundcube:button type="link-menuitem" command="files-copy" label="copyto" class="copy" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
+	</ul>
+</div>
+
+<script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_files/skins/elastic/templates/message_plugin.html b/plugins/kolab_files/skins/elastic/templates/message_plugin.html
new file mode 100644
index 00000000..b6372c3f
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/templates/message_plugin.html
@@ -0,0 +1,27 @@
+<div id="files-dialog" class="popupmenu selection-list" data-editable="true" role="dialog" aria-labelledby="aria-label-filesavedialog">
+	<h3 id="aria-label-filesavedialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesavedialog" /></h3>
+	<div class="header">
+		<span class="header-title" data-hidden="small"><roundcube:label name="folders" /></span>
+		<span class="header-title" data-hidden="big"><roundcube:label name="kolab_files.saveto" /></span>
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
+	<h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
+	<div id="files-folder-list" class="scroller" aria-labelledby="aria-label-folderlist" data-no-collections="true"></div>
+	<div id="file-save-as" class="form-addon form-group row">
+		<label for="file-save-as-input" class="col-form-label col-sm-4"><roundcube:label name="kolab_files.saveas" /></label>
+		<div class="col-sm-8">
+			<input id="file-save-as-input" type="text" value="" class="form-control">
+		</div>
+	</div>
+</div>
+
+<div id="files-folder-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldercreateform">
+	<h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
+	<roundcube:object name="folder-create-form" />
+</div>
+
+<div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
+	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
+	<roundcube:object name="folder-auth-options">
+</div>
diff --git a/plugins/kolab_files/skins/elastic/templates/share.html b/plugins/kolab_files/skins/elastic/templates/share.html
new file mode 100644
index 00000000..36fba1f4
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/templates/share.html
@@ -0,0 +1,9 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_files.foldershare" /></h1>
+
+<div class="formcontent">
+	<roundcube:object name="share-form" id="shareform" class="tabbed propform" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_files/skins/elastic/ui.js b/plugins/kolab_files/skins/elastic/ui.js
new file mode 100644
index 00000000..48c23dfa
--- /dev/null
+++ b/plugins/kolab_files/skins/elastic/ui.js
@@ -0,0 +1,147 @@
+function kolab_files_enable_command(p)
+{
+    if (p.command == 'files-save') {
+        var toolbar = $('#toolbar-menu');
+        $('a.button.edit', toolbar).parent().hide();
+        $('a.button.save', toolbar).show().parent().show();
+
+        if (window.editor_edit_button)
+            window.editor_edit_button.addClass('hidden');
+        if (window.editor_save_button)
+            window.editor_save_button.removeClass('hidden');
+    }
+    else if (p.command == 'files-edit' && p.status) {
+        if (window.editor_edit_button)
+            window.editor_edit_button.removeClass('hidden');
+    }
+};
+
+function kolab_files_listoptions(type)
+{
+    var content = $('#' + type + 'listoptions'),
+        width = content.width() + 25,
+        dialog = content.clone(true),
+        title = rcmail.gettext('kolab_files.arialabel' + (type == 'sessions' ? 'sessions' : '') + 'listoptions'),
+        close_func = function() { rcmail[type + 'list'].focus(); },
+        save_func = function(e) {
+            if (rcube_event.is_keyboard(e.originalEvent)) {
+                $('#' + type + 'listmenu-link').focus();
+            }
+
+            var col = $('select[name="sort_col"]', dialog).val(),
+                ord = $('select[name="sort_ord"]', dialog).val();
+
+            kolab_files_set_list_options([], col, ord, type);
+            close_func();
+            return true;
+        };
+
+    // set form values
+    $('select[name="sort_col"]', dialog).val(rcmail.env[type + '_sort_col'] || 'name');
+    $('select[name="sort_ord"]', dialog).val(rcmail.env[type + '_sort_order'] == 'DESC' ? 'DESC' : 'ASC');
+
+    dialog = rcmail.simple_dialog(dialog, title, save_func, {
+        cancel_func: close_func,
+        closeOnEscape: true,
+        minWidth: 400,
+        width: width
+    });
+};
+
+function kolab_files_members_list(link)
+{
+    var dialog = $('<div id="members-dialog" class="session-members"><ul></ul></div>'),
+        title = $(link).text(),
+        add_button = $('#collaborators a.button.add'),
+        save_func = function(e) {
+            add_button.click();
+            return true;
+        };
+
+    if (add_button.is('.disabled')) {
+        save_func = null;
+    }
+
+    $('#members img').each(function() {
+        var cloned = $(this).clone();
+        $('<li>').append(cloned).append($('<span>').text(this.title))
+            .appendTo(dialog.find('ul'));
+    });
+
+    dialog = rcmail.simple_dialog(dialog, title, save_func, {
+        closeOnEscape: true,
+        width: 400,
+        button: 'kolab_files.addparticipant',
+        button_class: 'participant add',
+        cancel_button: 'close'
+    });
+};
+
+
+if (rcmail.env.action == 'open') {
+    rcmail.addEventListener('enable-command', kolab_files_enable_command);
+
+    // center and scale the image in preview frame
+    if (rcmail.env.mimetype.startsWith('image/')) {
+        $('#fileframe').on('load', function() {
+            var css = 'img { max-width:100%; max-height:100%; } ' // scale
+                + 'body { display:flex; align-items:center; justify-content:center; height:100%; margin:0; }'; // align
+
+            $(this).contents().find('head').append('<style type="text/css">'+ css + '</style>');
+        });
+    }
+
+    // Elastic mobile preview uses an iframe in a dialog
+    if (rcmail.is_framed()) {
+        var edit_button = $('#filetoolbar a.button.edit'),
+            save_button = $('#filetoolbar a.button.save');
+
+        parent.$('.ui-dialog:visible .ui-dialog-buttonpane .ui-dialog-buttonset').prepend(
+            window.editor_save_button = $('<button type="button">')
+                .addClass('save btn btn-secondary' + (save_button.is('.disabled') ? ' hidden' : ''))
+                .text(save_button.text())
+                .on('click', function() { save_button.click(); })
+        );
+
+        parent.$('.ui-dialog:visible .ui-dialog-buttonpane .ui-dialog-buttonset').prepend(
+            window.editor_edit_button = $('<button type="button">')
+                .addClass('edit btn btn-secondary' + (edit_button.is('.disabled') ? ' hidden' : ''))
+                .text(edit_button.text())
+                .on('click', function() { edit_button.click(); })
+        );
+    }
+}
+else if (rcmail.env.action == 'edit') {
+    rcmail.gui_object('exportmenu', 'export-menu');
+}
+else {
+    rcmail.addEventListener('files-folder-select', function(p) {
+        var is_sess = p.folder == 'folder-collection-sessions';
+        $('#fileslistmenu-link, #layout > .content > .pagenav, #layout > .content .searchbar')[is_sess ? 'hide' : 'show']();
+        $('#sessionslistmenu-link')[is_sess ? 'removeClass' : 'addClass']('hidden');
+
+        // set list header title for mobile
+        // $('#layout > .content > .header > .header-title').text($('#files-folder-list li.selected a.name:first').text());
+    });
+}
+
+$(document).ready(function() {
+    if (rcmail.env.action == 'open') {
+        $('#toolbar-menu a.button.save').parent().hide();
+    }
+    else if (rcmail.env.action == 'edit') {
+        if (rcmail.is_framed()) {
+            parent.$('.ui-dialog:visible .ui-dialog-buttonpane').addClass('hidden');
+        }
+    }
+
+    if ($('#dragfilemenu').length) {
+        rcmail.gui_object('file_dragmenu', 'dragfilemenu');
+    }
+
+    if ($('#filesearchmenu').length) {
+        rcmail.gui_object('file_searchmenu', 'filesearchmenu');
+    }
+});
+
+kolab_files_upload_input('#filesuploadform');
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 6071b224..e12cf239 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -80,6 +80,7 @@
   vertical-align: top;
   color: #555;
   text-shadow: 0 1px 1px #eee;
+  display: inline-block;
 }
 
 ul.toolbarmenu li span.saveas {
@@ -376,7 +377,7 @@ ul.toolbarmenu li span.saveas {
   table-layout: fixed;
 }
 
-#fileinfobox table td.label {
+#fileinfobox table td.title {
   width: 60px;
   font-weight: bold;
   padding-right: 0;
@@ -628,3 +629,30 @@ table.propform td.source table.propform td {
   white-space: nowrap;
   font-weight: bold;
 }
+
+#folder-share table {
+  margin-top: 20px;
+  width: 100%;
+}
+
+#folder-share table th {
+  text-align: left;
+}
+
+#folder-share table th,
+#folder-share table td {
+  padding: 5px;
+}
+
+#folder-share table td:last-child {
+  width: 1%;
+}
+
+#folder-share table select,
+#folder-share table input {
+  width: 100%;
+}
+
+#folder-share table td.form input {
+  margin-bottom: 4px;
+}
diff --git a/plugins/kolab_files/skins/larry/templates/compose_plugin.html b/plugins/kolab_files/skins/larry/templates/compose_plugin.html
index 4e249edd..1aa0a5f5 100644
--- a/plugins/kolab_files/skins/larry/templates/compose_plugin.html
+++ b/plugins/kolab_files/skins/larry/templates/compose_plugin.html
@@ -3,24 +3,24 @@
     <div id="quicksearchbar" class="searchbox" role="search" aria-labelledby="aria-label-searchform">
         <h3 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_files.arialabelsearchform" /></h3>
         <label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
-        <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="return UI.toggle_popup('filesearchmenu', event)" title="searchmod"  label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
+        <roundcube:button type="link" name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="return UI.toggle_popup('filesearchmenu', event)" title="searchmod"  label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
         <roundcube:object name="file-search-form" id="filesearchbox" />
-        <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+        <roundcube:button type="link" command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
     </div>
 
     <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
         <h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
         <h3 id="folderslist-header" class="boxtitle">
             <roundcube:label name="folders" />
-            <a href="#folders" class="iconbutton search" title="<roundcube:label name='findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
+            <a href="#folders" class="iconbutton search" title="<roundcube:label name='kolab_files.findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
         </h3>
         <div class="listsearchbox">
             <div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
                 <h4 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h4>
                 <label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
-                <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
+                <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='kolab_files.findfolders' />" />
                 <a class="iconbutton searchicon"></a>
-                <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+                <roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
             </div>
         </div>
         <div id="files-folder-list" class="scroller"></div>
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
index 90629786..be66a0cf 100644
--- a/plugins/kolab_files/skins/larry/templates/docedit.html
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -9,7 +9,7 @@
 
 <roundcube:include file="/includes/header.html" />
 
-<div id="mainscreen" class="manticore">
+<div id="mainscreen" class="<roundcube:var name="env:editor_type" />">
 
 <h1 class="voice"><roundcube:label name="kolab_files.docedit" /></h1>
 
@@ -23,13 +23,14 @@
         <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
         <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>
     </span>
-<!--
+<roundcube:if condition="env:editor_type == 'wopi'" />
     <roundcube:button command="document-print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="kolab_files.printfile" />
-    <span class="spacer"></span>
--->
+<roundcube:endif />
     <roundcube:button command="document-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" />
+<roundcube:if condition="env:editor_type != 'wopi'" />
     <span class="spacer"></span>
     <label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" value="" /></label>
+<roundcube:endif />
 </div>
 
 <h2 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h2>
@@ -53,7 +54,7 @@
 
 <div id="document-editors-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog" aria-hidden="true">
     <h3 id="aria-label-doceditorsdialog" class="voice"><roundcube:label name="kolab_files.arialabeldoceditorsdialog" /></h3>
-    <roundcube:object name="document-editors-dialog" />
+    <roundcube:object name="document-editors-dialog" class="records-table" />
 </div>
 
 <roundcube:include file="/includes/footer.html" />
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index db5a222c..8aa15351 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -29,24 +29,24 @@
 <div id="quicksearchbar" class="quicksearchbox" role="search" aria-labelledby="aria-label-searchform">
     <h2 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_files.arialabelsearchform" /></h2>
     <label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
-    <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="UI.toggle_popup('filesearchmenu', event); return false" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
+    <roundcube:button type="link" name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="UI.toggle_popup('filesearchmenu', event); return false" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
     <roundcube:object name="file-search-form" id="quicksearchbox" />
-    <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+    <roundcube:button type="link" command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 </div>
 
 <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
     <h2 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h2>
     <h2 id="folderslist-header" class="boxtitle">
         <roundcube:label name="folders" />
-        <a href="#folders" class="iconbutton search" title="<roundcube:label name='findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
+        <a href="#folders" class="iconbutton search" title="<roundcube:label name='kolab_files.findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
     </h2>
     <div class="listsearchbox">
         <div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
             <h3 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h3>
             <label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
-            <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
+            <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='kolab_files.findfolders' />" />
             <a class="iconbutton searchicon"></a>
-            <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+            <roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
         </div>
     </div>
     <div id="files-folder-list" class="scroller withfooter"></div>
@@ -75,12 +75,15 @@
 <div id="folderoptions" class="popupmenu" data-editable="true" aria-hidden="true">
     <h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
     <ul id="folderoptionsmenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-folderoptions">
-        <li role="menuitem"><roundcube:button command="folder-rename" label="rename" classAct="active" /></li>
-        <li role="menuitem"><roundcube:button command="files-folder-delete" label="delete" classAct="active" /></li>
-        <roundcube:if condition="!empty(env:external_sources)" />
-        <li role="menuitem"><roundcube:button command="folder-mount" label="kolab_files.foldermount" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="folder-rename" label="rename" classAct="active" /></li>
+        <roundcube:if condition="env:files_api_version &gt; 3" />
+        <li role="menuitem"><roundcube:button type="link" command="folder-share" label="kolab_files.share" classAct="active" /></li>
         <roundcube:endif />
-        <li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="files-folder-delete" label="delete" classAct="active" /></li>
+        <roundcube:if condition="!empty(env:external_sources)" />
+        <li role="menuitem"><roundcube:button type="link" command="folder-mount" label="kolab_files.foldermount" classAct="active" /></li>
+        <roundcube:endif />
+        <li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
         <roundcube:container name="filesfolderoptions" id="folderoptionsmenu" />
     </ul>
 </div>
@@ -203,8 +206,8 @@
 
 <div id="dragfilemenu" class="popupmenu" aria-hidden="true">
     <ul class="toolbarmenu" role="menu">
-        <li role="menuitem"><roundcube:button command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" /></li>
-        <li role="menuitem"><roundcube:button command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" /></li>
     </ul>
 </div>
 
diff --git a/plugins/kolab_files/skins/larry/templates/message_plugin.html b/plugins/kolab_files/skins/larry/templates/message_plugin.html
index df8452b0..3b66a4c2 100644
--- a/plugins/kolab_files/skins/larry/templates/message_plugin.html
+++ b/plugins/kolab_files/skins/larry/templates/message_plugin.html
@@ -4,9 +4,9 @@
         <div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
             <h4 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h4>
             <label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
-            <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
+            <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='kolab_files.findfolders' />" />
             <a class="iconbutton searchicon"></a>
-            <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+            <roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
         </div>
     </div>
     <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
diff --git a/plugins/calendar/skins/larry/templates/kolabacl.html b/plugins/kolab_files/skins/larry/templates/share.html
similarity index 51%
rename from plugins/calendar/skins/larry/templates/kolabacl.html
rename to plugins/kolab_files/skins/larry/templates/share.html
index ed9b0c7e..ee3067ec 100644
--- a/plugins/calendar/skins/larry/templates/kolabacl.html
+++ b/plugins/kolab_files/skins/larry/templates/share.html
@@ -3,22 +3,14 @@
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
-<style type="text/css" media="screen">
-
-body.aclform {
-	background: #efefef;
-	margin: 0;
-}
-
-body.aclform .hint {
-	margin: 1em;
-}
-
-</style>
 </head>
-<body class="iframe aclform">
+<body class="iframe fullheight">
 
-<roundcube:object name="folderacl" />
+<h1 class="voice"><roundcube:label name="kolab_files.foldershare" /></h1>
+
+<div id="folder-share" class="boxcontent">
+	<roundcube:object name="share-form" id="folder-shareform" class="tabbed" />
+</div>
 
 <roundcube:include file="/includes/footer.html" />
 
diff --git a/plugins/kolab_folders/composer.json b/plugins/kolab_folders/composer.json
index 7e381e80..86ccace3 100644
--- a/plugins/kolab_folders/composer.json
+++ b/plugins/kolab_folders/composer.json
@@ -4,7 +4,7 @@
     "description": "Type-aware folder management/listing for Kolab",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -21,6 +21,6 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_folders/kolab_folders.js b/plugins/kolab_folders/kolab_folders.js
index b9d92258..2dac049b 100644
--- a/plugins/kolab_folders/kolab_folders.js
+++ b/plugins/kolab_folders/kolab_folders.js
@@ -51,7 +51,7 @@ window.rcmail && rcmail.env.action == 'folders' && rcmail.addEventListener('init
 
 window.rcmail && rcmail.env.action != 'folders' && $(document).ready(function() {
     // Add onchange handler for folder type SELECT, and call it on form init
-    $('#_ctype').change(function() {
+    $('#_folderctype').change(function() {
         var type = $(this).val(),
             sub = $('#_subtype'),
             subtypes = rcmail.env.kolab_folder_subtypes[type] || {};
diff --git a/plugins/kolab_folders/kolab_folders.php b/plugins/kolab_folders/kolab_folders.php
index 242ef08b..1ca29803 100644
--- a/plugins/kolab_folders/kolab_folders.php
+++ b/plugins/kolab_folders/kolab_folders.php
@@ -3,10 +3,9 @@
 /**
  * Type-aware folder management/listing for Kolab
  *
- * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2017, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -42,6 +41,7 @@ class kolab_folders extends rcube_plugin
 
     private $rc;
     private static $instance;
+    private $expire_annotation = '/shared/vendor/cmu/cyrus-imapd/expire';
 
 
     /**
@@ -206,6 +206,8 @@ class kolab_folders extends rcube_plugin
                 'value' => sprintf('%s (%s)', $this->gettext('foldertypemail'), $this->gettext('inbox')),
             );
 
+            $this->add_expire_input($args['form'], 'INBOX');
+
             return $args;
         }
 
@@ -260,7 +262,9 @@ class kolab_folders extends rcube_plugin
         $this->include_script('kolab_folders.js');
 
         // build type SELECT fields
-        $type_select = new html_select(array('name' => '_ctype', 'id' => '_ctype'));
+        $type_select = new html_select(array('name' => '_ctype', 'id' => '_folderctype',
+            'onchange' => "\$('[name=\"_expire\"]').attr('disabled', \$(this).val() != 'mail')"
+        ));
         $sub_select  = new html_select(array('name' => '_subtype', 'id' => '_subtype'));
         $sub_select->add('', '');
 
@@ -282,15 +286,19 @@ class kolab_folders extends rcube_plugin
             }
         }
 
-        $args['form']['props']['fieldsets']['settings']['content']['foldertype'] = array(
+        $args['form']['props']['fieldsets']['settings']['content']['folderctype'] = array(
             'label' => $this->gettext('folderctype'),
-            'value' => $type_select->show(isset($new_ctype) ? $new_ctype : $ctype)
-                . $sub_select->show(isset($new_subtype) ? $new_subtype : $subtype),
+            'value' => html::div('input-group',
+                $type_select->show(isset($new_ctype) ? $new_ctype : $ctype)
+                . $sub_select->show(isset($new_subtype) ? $new_subtype : $subtype)
+            ),
         );
 
         $this->rc->output->set_env('kolab_folder_subtypes', $sub_types);
         $this->rc->output->set_env('kolab_folder_subtype', isset($new_subtype) ? $new_subtype : $subtype);
 
+        $this->add_expire_input($args['form'], $args['name'], $ctype);
+
         return $args;
     }
 
@@ -373,7 +381,15 @@ class kolab_folders extends rcube_plugin
             }
         }
 
-        $args['record']['class'] = self::folder_class_name($ctype);
+        // Set messages expiration in days
+        if ($result && isset($_POST['_expire'])) {
+            $expire = trim(rcube_utils::get_input_value('_expire', rcube_utils::INPUT_POST));
+            $expire = intval($expire) && preg_match('/^mail/', $ctype) ? intval($expire) : null;
+
+            $storage->set_metadata($mbox, array($this->expire_annotation => $expire));
+        }
+
+        $args['record']['class']     = self::folder_class_name($ctype);
         $args['record']['subscribe'] = $subscribe;
         $args['result'] = $result;
 
@@ -464,13 +480,11 @@ class kolab_folders extends rcube_plugin
             // we're dealing with a groupware folder here...
             if ($type && $type !== 'mail') {
                 if ($args['rights']['write'] && $args['rights']['delete']) {
-                    $writeperms = $args['rights']['write'] . $args['rights']['delete'];
-                    $items = array(
-                        'read'   => 'lr',
-                        'write'  => $writeperms,
-                        'other'  => preg_replace('/[lr'.$writeperms.']/', '', $args['rights']['other']),
-                    );
-                    $args['rights'] = $items;
+                    $write_perms = $args['rights']['write'] . $args['rights']['delete'];
+                    $rw_perms    = $write_perms . $args['rights']['read'];
+
+                    $args['rights']['write'] = $write_perms;
+                    $args['rights']['other'] = preg_replace("/[$rw_perms]/", '', $args['rights']['other']);
 
                     // add localized labels and titles for the altered items
                     $args['labels'] = array(
@@ -501,7 +515,7 @@ class kolab_folders extends rcube_plugin
             // we're dealing with a groupware folder here...
             if ($type && $type !== 'mail') {
                 // remove some irrelevant (for groupware objects) rights
-                $args['rights'] = str_split(preg_replace('/[sp]/', '', join('', $args['rights'])));
+                $args['rights'] = str_split(preg_replace('/[p]/', '', join('', $args['rights'])));
             }
         }
 
@@ -701,4 +715,70 @@ class kolab_folders extends rcube_plugin
     {
         return self::$instance->get_default_folder($type);
     }
+
+    /**
+     * Get /shared/vendor/cmu/cyrus-imapd/expire value
+     *
+     * @param string $folder IMAP folder name
+     *
+     * @return int|false The annotation value or False if not supported
+     */
+    private function get_expire_annotation($folder)
+    {
+        $storage = $this->rc->get_storage();
+
+        if ($storage->get_vendor() != 'cyrus') {
+            return false;
+        }
+
+        if (!strlen($folder)) {
+            return 0;
+        }
+
+        $value = $storage->get_metadata($folder, $this->expire_annotation);
+
+        if (is_array($value)) {
+            return $value[$folder] ? intval($value[$folder][$this->expire_annotation]) : 0;
+        }
+
+        return false;
+    }
+
+    /**
+     * Add expiration time input to the form if supported
+     */
+    private function add_expire_input(&$form, $folder, $type = null)
+    {
+        if (($expire = $this->get_expire_annotation($folder)) !== false) {
+            $post    = trim(rcube_utils::get_input_value('_expire', rcube_utils::INPUT_POST));
+            $is_mail = empty($type) || preg_match('/^mail/i', $type);
+            $label   = $this->gettext('xdays');
+            $input   = new html_inputfield(array(
+                    'id'       => '_kolabexpire',
+                    'name'     => '_expire',
+                    'size'     => 3,
+                    'disabled' => !$is_mail
+            ));
+
+            if ($post && $is_mail) {
+                $expire = (int) $post;
+            }
+
+            if (strpos($label, '$') === 0) {
+                $label = str_replace('$x', '', $label);
+                $html  = $input->show($expire ?: '')
+                    . html::span('input-group-append', html::span('input-group-text', rcube::Q($label)));
+            }
+            else {
+                $label = str_replace('$x', '', $label);
+                $html  = html::span('input-group-prepend', html::span('input-group-text', rcube::Q($label)))
+                    . $input->show($expire ?: '');
+            }
+
+            $form['props']['fieldsets']['settings']['content']['kolabexpire'] = array(
+                'label' => $this->gettext('folderexpire'),
+                'value' => html::div('input-group', $html),
+            );
+        }
+    }
 }
diff --git a/plugins/kolab_folders/localization/bg.inc b/plugins/kolab_folders/localization/bg.inc
new file mode 100644
index 00000000..500a40fa
--- /dev/null
+++ b/plugins/kolab_folders/localization/bg.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['foldertypetask'] = 'Задачи';
+?>
diff --git a/plugins/kolab_folders/localization/cs_CZ.inc b/plugins/kolab_folders/localization/cs_CZ.inc
index f0744838..64a93dfa 100644
--- a/plugins/kolab_folders/localization/cs_CZ.inc
+++ b/plugins/kolab_folders/localization/cs_CZ.inc
@@ -24,5 +24,6 @@ $labels['outbox'] = 'Odeslaná pošta';
 $labels['wastebasket'] = 'Koš';
 $labels['junkemail'] = 'Nevyžádaná pošta';
 $labels['confidential'] = 'Důvěrné';
+$labels['private'] = 'Soukromé';
 $messages['defaultfolderexists'] = 'Již je výchozí složka daného typu';
 ?>
diff --git a/plugins/kolab_folders/localization/de_CH.inc b/plugins/kolab_folders/localization/de_CH.inc
index 8a1f7b99..f3c95ae3 100644
--- a/plugins/kolab_folders/localization/de_CH.inc
+++ b/plugins/kolab_folders/localization/de_CH.inc
@@ -24,5 +24,6 @@ $labels['outbox'] = 'Postausgang';
 $labels['wastebasket'] = 'Gelöscht';
 $labels['junkemail'] = 'Spam';
 $labels['confidential'] = 'Confidential';
+$labels['private'] = 'Privat';
 $messages['defaultfolderexists'] = 'Es existiert bereits ein Standardordner für den angegebenen Typ';
 ?>
diff --git a/plugins/kolab_folders/localization/de_DE.inc b/plugins/kolab_folders/localization/de_DE.inc
index 3055b163..96a85235 100644
--- a/plugins/kolab_folders/localization/de_DE.inc
+++ b/plugins/kolab_folders/localization/de_DE.inc
@@ -25,5 +25,6 @@ $labels['wastebasket'] = 'Mülleimer';
 $labels['junkemail'] = 'Spam';
 $labels['confidential'] = 'Vertraulich';
 $labels['private'] = 'Privat';
+$labels['xdays'] = '$x Tage';
 $messages['defaultfolderexists'] = 'Es gibt bereits einen Standardordner des angegebenen Typs';
 ?>
diff --git a/plugins/kolab_folders/localization/el.inc b/plugins/kolab_folders/localization/el.inc
new file mode 100644
index 00000000..dabda063
--- /dev/null
+++ b/plugins/kolab_folders/localization/el.inc
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['foldertypemail'] = 'Αλληλογραφία';
+$labels['foldertypeevent'] = 'Ημερολόγιο';
+$labels['foldertypetask'] = 'Εργασίες';
+$labels['foldertypenote'] = 'Σημειώσεις';
+$labels['foldertypecontact'] = 'Επαφές';
+$labels['foldertypeconfiguration'] = 'Ρυθμίσεις';
+$labels['foldertypefile'] = 'Αρχεία';
+$labels['default'] = 'Προεπιλογή';
+$labels['inbox'] = 'Εισερχόμενα';
+$labels['drafts'] = 'Πρόχειρα';
+$labels['outbox'] = 'Εξερχόμενα';
+$labels['wastebasket'] = 'Κάδος απορριμάτων';
+$labels['confidential'] = 'Εμπιστευτικό';
+$labels['private'] = 'Ιδιωτικό';
+?>
diff --git a/plugins/kolab_folders/localization/en_US.inc b/plugins/kolab_folders/localization/en_US.inc
index 0c234d65..a7268311 100644
--- a/plugins/kolab_folders/localization/en_US.inc
+++ b/plugins/kolab_folders/localization/en_US.inc
@@ -30,6 +30,8 @@ $labels['wastebasket'] = 'Trash';
 $labels['junkemail'] = 'Junk';
 $labels['confidential'] = 'Confidential';
 $labels['private'] = 'Private';
+$labels['folderexpire'] = 'Delete messages older than';
+$labels['xdays'] = '$x days';
 
 $messages['defaultfolderexists'] = 'There is already default folder of specified type';
 
diff --git a/plugins/kolab_folders/localization/es_AR.inc b/plugins/kolab_folders/localization/es_AR.inc
index 276f2139..4f9556fe 100644
--- a/plugins/kolab_folders/localization/es_AR.inc
+++ b/plugins/kolab_folders/localization/es_AR.inc
@@ -24,5 +24,8 @@ $labels['outbox'] = 'Bandeja de salida';
 $labels['wastebasket'] = 'Papelera';
 $labels['junkemail'] = 'Basura';
 $labels['confidential'] = 'Confidential';
+$labels['private'] = 'Privado';
+$labels['folderexpire'] = 'Eliminar mensajes mas antiguos que';
+$labels['xdays'] = '$x días';
 $messages['defaultfolderexists'] = 'Ya existe una carpeta predeterminada del tipo especificado';
 ?>
diff --git a/plugins/kolab_folders/localization/es_ES.inc b/plugins/kolab_folders/localization/es_ES.inc
index 38abfe78..770c31f4 100644
--- a/plugins/kolab_folders/localization/es_ES.inc
+++ b/plugins/kolab_folders/localization/es_ES.inc
@@ -24,5 +24,8 @@ $labels['outbox'] = 'Outbox';
 $labels['wastebasket'] = 'Trash';
 $labels['junkemail'] = 'Junk';
 $labels['confidential'] = 'Confidential';
+$labels['private'] = 'Privado';
+$labels['folderexpire'] = 'Eliminar mensajes anteriores a';
+$labels['xdays'] = '$x días';
 $messages['defaultfolderexists'] = 'There is already default folder of specified type';
 ?>
diff --git a/plugins/kolab_folders/localization/et_EE.inc b/plugins/kolab_folders/localization/et_EE.inc
index f93ac64b..a99eddfd 100644
--- a/plugins/kolab_folders/localization/et_EE.inc
+++ b/plugins/kolab_folders/localization/et_EE.inc
@@ -6,23 +6,22 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
  */
-$labels['folderctype'] = 'Content type';
-$labels['foldertypemail'] = 'Mail';
-$labels['foldertypeevent'] = 'Calendar';
-$labels['foldertypejournal'] = 'Journal';
-$labels['foldertypetask'] = 'Tasks';
-$labels['foldertypenote'] = 'Notes';
-$labels['foldertypecontact'] = 'Contacts';
-$labels['foldertypeconfiguration'] = 'Configuration';
-$labels['foldertypefile'] = 'Files';
-$labels['foldertypefreebusy'] = 'Free-Busy';
-$labels['default'] = 'Default';
-$labels['inbox'] = 'Inbox';
-$labels['drafts'] = 'Drafts';
-$labels['sentitems'] = 'Sent';
-$labels['outbox'] = 'Outbox';
-$labels['wastebasket'] = 'Trash';
-$labels['junkemail'] = 'Junk';
-$labels['confidential'] = 'Confidential';
-$messages['defaultfolderexists'] = 'There is already default folder of specified type';
+$labels['folderctype'] = 'Sisu liik';
+$labels['foldertypemail'] = 'E-post';
+$labels['foldertypeevent'] = 'Kalender';
+$labels['foldertypejournal'] = 'Päevik';
+$labels['foldertypetask'] = 'Ülesanded';
+$labels['foldertypenote'] = 'Märkmed';
+$labels['foldertypecontact'] = 'Kontaktid';
+$labels['foldertypeconfiguration'] = 'Seadistamine';
+$labels['foldertypefile'] = 'Failid';
+$labels['foldertypefreebusy'] = 'Vaba-Hõivatud';
+$labels['default'] = 'Vaikeväärtus';
+$labels['inbox'] = 'Saabunud';
+$labels['drafts'] = 'Mustandid';
+$labels['sentitems'] = 'Saadetud';
+$labels['outbox'] = 'Väljuvad';
+$labels['wastebasket'] = 'Prügikast';
+$labels['junkemail'] = 'Rämpspost';
+$labels['confidential'] = 'Konfidentsiaalne';
 ?>
diff --git a/plugins/kolab_folders/localization/fi_FI.inc b/plugins/kolab_folders/localization/fi_FI.inc
index a5b8bf9e..51a01cbe 100644
--- a/plugins/kolab_folders/localization/fi_FI.inc
+++ b/plugins/kolab_folders/localization/fi_FI.inc
@@ -25,5 +25,7 @@ $labels['wastebasket'] = 'Roskakori';
 $labels['junkemail'] = 'Roskaposti';
 $labels['confidential'] = 'Luottamuksellinen';
 $labels['private'] = 'Yksityinen';
+$labels['folderexpire'] = 'Poista viestit, jotka ovat vanhempia kuin';
+$labels['xdays'] = '$x päivää';
 $messages['defaultfolderexists'] = 'Määritetylle tyypille on jo olemassa oletuskansio';
 ?>
diff --git a/plugins/kolab_folders/localization/fr_FR.inc b/plugins/kolab_folders/localization/fr_FR.inc
index bc0a8437..936988c4 100644
--- a/plugins/kolab_folders/localization/fr_FR.inc
+++ b/plugins/kolab_folders/localization/fr_FR.inc
@@ -16,7 +16,7 @@ $labels['foldertypecontact'] = 'Contacts';
 $labels['foldertypeconfiguration'] = 'Configuration';
 $labels['foldertypefile'] = 'Fichiers';
 $labels['foldertypefreebusy'] = 'Disponible/Occupé';
-$labels['default'] = 'Par Défaut';
+$labels['default'] = 'Par défaut';
 $labels['inbox'] = 'Courrier entrant';
 $labels['drafts'] = 'Brouillons';
 $labels['sentitems'] = 'Envoyés';
@@ -24,5 +24,6 @@ $labels['outbox'] = 'Courrier sortant';
 $labels['wastebasket'] = 'Corbeille';
 $labels['junkemail'] = 'Indésirables';
 $labels['confidential'] = 'Confidentiel';
+$labels['private'] = 'Privé';
 $messages['defaultfolderexists'] = 'Il existe déjà un répertoire par défaut pour le type spécifié';
 ?>
diff --git a/plugins/kolab_folders/localization/hr_HR.inc b/plugins/kolab_folders/localization/hr_HR.inc
new file mode 100644
index 00000000..200ade51
--- /dev/null
+++ b/plugins/kolab_folders/localization/hr_HR.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['foldertypeevent'] = 'Kalendar';
+?>
diff --git a/plugins/kolab_folders/localization/ko_KR.inc b/plugins/kolab_folders/localization/ko_KR.inc
new file mode 100644
index 00000000..bb8f6207
--- /dev/null
+++ b/plugins/kolab_folders/localization/ko_KR.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['foldertypeevent'] = '캘린더';
+?>
diff --git a/plugins/kolab_folders/localization/lv.inc b/plugins/kolab_folders/localization/lv.inc
new file mode 100644
index 00000000..1918abda
--- /dev/null
+++ b/plugins/kolab_folders/localization/lv.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['foldertypemail'] = 'E-pasts';
+$labels['foldertypeevent'] = 'Kalendārs';
+$labels['foldertypefile'] = 'Faili';
+?>
diff --git a/plugins/kolab_folders/localization/nl_NL.inc b/plugins/kolab_folders/localization/nl_NL.inc
index 433ef6ae..c3b938dd 100644
--- a/plugins/kolab_folders/localization/nl_NL.inc
+++ b/plugins/kolab_folders/localization/nl_NL.inc
@@ -12,17 +12,18 @@ $labels['foldertypeevent'] = 'Agenda';
 $labels['foldertypejournal'] = 'Dagboek';
 $labels['foldertypetask'] = 'Taken';
 $labels['foldertypenote'] = 'Notities';
-$labels['foldertypecontact'] = 'Adresboek';
+$labels['foldertypecontact'] = 'Contactpersonen';
 $labels['foldertypeconfiguration'] = 'Configuratie';
 $labels['foldertypefile'] = 'Bestanden';
-$labels['foldertypefreebusy'] = 'Vrij/Bezet';
+$labels['foldertypefreebusy'] = 'Beschikbaar/Bezet';
 $labels['default'] = 'Standaard';
-$labels['inbox'] = 'Inbox';
+$labels['inbox'] = 'Postvak IN';
 $labels['drafts'] = 'Concepten';
-$labels['sentitems'] = 'Verzonden';
-$labels['outbox'] = 'Te versturen';
+$labels['sentitems'] = 'Verstuurd';
+$labels['outbox'] = 'Postvak UIT';
 $labels['wastebasket'] = 'Prullenbak';
 $labels['junkemail'] = 'Ongewenst';
 $labels['confidential'] = 'Vertrouwelijk';
-$messages['defaultfolderexists'] = 'Er is reeds een standaard map voor dit type inhoud';
+$labels['private'] = 'Privé';
+$messages['defaultfolderexists'] = 'Er is al een standaardmap van het opgegeven type';
 ?>
diff --git a/plugins/kolab_folders/localization/pt_PT.inc b/plugins/kolab_folders/localization/pt_PT.inc
index c3f13280..ccf96f63 100644
--- a/plugins/kolab_folders/localization/pt_PT.inc
+++ b/plugins/kolab_folders/localization/pt_PT.inc
@@ -7,4 +7,8 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
  */
 $labels['foldertypeevent'] = 'Calendário';
+$labels['foldertypetask'] = 'Tarefas';
+$labels['foldertypenote'] = 'Notas';
+$labels['foldertypeconfiguration'] = 'Configuração';
+$labels['foldertypefile'] = 'Ficheiros';
 ?>
diff --git a/plugins/kolab_folders/localization/sk_SK.inc b/plugins/kolab_folders/localization/sk_SK.inc
new file mode 100644
index 00000000..04943f25
--- /dev/null
+++ b/plugins/kolab_folders/localization/sk_SK.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['foldertypeevent'] = 'Kalendár';
+?>
diff --git a/plugins/kolab_folders/localization/sv_SE.inc b/plugins/kolab_folders/localization/sv_SE.inc
index 6272ee17..ca563050 100644
--- a/plugins/kolab_folders/localization/sv_SE.inc
+++ b/plugins/kolab_folders/localization/sv_SE.inc
@@ -6,7 +6,6 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
  */
-
 $labels['folderctype'] = 'Innehållstyp';
 $labels['foldertypemail'] = 'E-post';
 $labels['foldertypeevent'] = 'Kalender';
@@ -26,5 +25,4 @@ $labels['wastebasket'] = 'Papperskorg';
 $labels['junkemail'] = 'Skräp';
 $labels['confidential'] = 'Konfidentiellt';
 $messages['defaultfolderexists'] = 'Det finns redan en standardmapp för specificerad typ';
-
 ?>
diff --git a/plugins/kolab_folders/localization/zh_CN.inc b/plugins/kolab_folders/localization/zh_CN.inc
index 4e0e3c9c..6881da66 100644
--- a/plugins/kolab_folders/localization/zh_CN.inc
+++ b/plugins/kolab_folders/localization/zh_CN.inc
@@ -7,4 +7,8 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
  */
 $labels['foldertypenote'] = '笔记';
+$labels['foldertypefile'] = '文件';
+$labels['inbox'] = '收件箱';
+$labels['drafts'] = '草稿箱';
+$labels['wastebasket'] = '垃圾箱';
 ?>
diff --git a/plugins/kolab_notes/composer.json b/plugins/kolab_notes/composer.json
index b294fad0..d2ecf3fa 100644
--- a/plugins/kolab_notes/composer.json
+++ b/plugins/kolab_notes/composer.json
@@ -4,7 +4,7 @@
     "description": "Notes module for Roundcube connecting to a Kolab server for storage",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -21,7 +21,7 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8",
+        "kolab/libkolab": ">=3.4.0",
         "roundcube/jqueryui": ">=1.10.4"
     }
 }
diff --git a/plugins/kolab_notes/kolab_notes.php b/plugins/kolab_notes/kolab_notes.php
index 7faee11c..d0547ede 100644
--- a/plugins/kolab_notes/kolab_notes.php
+++ b/plugins/kolab_notes/kolab_notes.php
@@ -46,11 +46,6 @@ class kolab_notes extends rcube_plugin
 
         $this->rc = rcube::get_instance();
 
-        $this->register_task('notes');
-
-        // load plugin configuration
-        $this->load_config();
-
         // proceed initialization in startup hook
         $this->add_hook('startup', array($this, 'startup'));
     }
@@ -65,6 +60,11 @@ class kolab_notes extends rcube_plugin
             return;
         }
 
+        $this->register_task('notes');
+
+        // load plugin configuration
+        $this->load_config();
+
         // load localizations
         $this->add_texts('localization/', $args['task'] == 'notes' && (!$args['action'] || $args['action'] == 'dialog-ui'));
         $this->rc->load_language($_SESSION['language'], array('notes.notes' => $this->gettext('navtitle')));  // add label for task title
@@ -79,6 +79,11 @@ class kolab_notes extends rcube_plugin
             $this->register_action('action', array($this, 'note_action'));
             $this->register_action('list',  array($this, 'list_action'));
             $this->register_action('dialog-ui', array($this, 'dialog_view'));
+            $this->register_action('print', array($this, 'print_note'));
+
+            if (!$this->rc->output->ajax_call && in_array($args['action'], array('dialog-ui', 'list'))) {
+                $this->load_ui();
+            }
         }
         else if ($args['task'] == 'mail') {
             $this->add_hook('storage_init', array($this, 'storage_init'));
@@ -107,7 +112,7 @@ class kolab_notes extends rcube_plugin
             }
         }
 
-        if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || in_array($args['action'], array('folder-acl','dialog-ui')))) {
+        if (!$this->rc->output->ajax_call && !$this->rc->output->env['framed']) {
             $this->load_ui();
         }
 
@@ -132,9 +137,11 @@ class kolab_notes extends rcube_plugin
      */
     private function load_ui()
     {
-        require_once($this->home . '/kolab_notes_ui.php');
-        $this->ui = new kolab_notes_ui($this);
-        $this->ui->init();
+        if (!$this->ui) {
+            require_once($this->home . '/kolab_notes_ui.php');
+            $this->ui = new kolab_notes_ui($this);
+            $this->ui->init();
+        }
     }
 
     /**
@@ -512,7 +519,7 @@ class kolab_notes extends rcube_plugin
 
         // encode for client use
         if (is_array($data)) {
-            $this->_client_encode($data, true);
+            $this->_client_encode($data);
         }
 
         $this->rc->output->command('plugin.render_note', $data);
@@ -824,6 +831,52 @@ class kolab_notes extends rcube_plugin
         return $status;
     }
 
+    /**
+     * Render the template for printing with placeholders
+     */
+    public function print_note()
+    {
+        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+        $list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GET);
+
+        $this->note = $this->get_note(array('uid' => $uid, 'list' => $list));
+
+        // encode for client use
+        if (is_array($this->note)) {
+            $this->_client_encode($this->note);
+        }
+
+        $this->rc->output->set_pagetitle($this->note['title']);
+        $this->rc->output->add_handlers(array(
+                'noteheader' => array($this, 'print_note_header'),
+                'notebody'   => array($this, 'print_note_body'),
+        ));
+
+        $this->include_script('notes.js');
+
+        $this->rc->output->send('kolab_notes.print');
+    }
+
+    public function print_note_header()
+    {
+        $tags = array_map(array('rcube', 'Q'), (array) $this->note['tags']);
+        $tags = implode(' ', $tags);
+
+        return html::tag('h1', array('id' => 'notetitle'), rcube::Q($this->note['title']))
+            . html::div(array('id' => 'notetags', 'class' => 'tagline'), $tags)
+            . html::div('dates',
+                html::label(null, rcube::Q($this->gettext('created')))
+                . html::span(array('id' => 'notecreated'), rcube::Q($this->note['created']))
+                . html::label(null, rcube::Q($this->gettext('changed')))
+                . html::span(array('id' => 'notechanged'), rcube::Q($this->note['changed']))
+            );
+    }
+
+    public function print_note_body()
+    {
+        return isset($this->note['html']) ? $this->note['html'] : rcube::Q($this->note['description']);
+    }
+
     /**
      * Provide a list of revisions for the given object
      *
@@ -1027,7 +1080,7 @@ class kolab_notes extends rcube_plugin
             case 'form-new':
             case 'form-edit':
                 $this->_read_lists();
-                echo $this->ui->list_editform($action, $this->lists[$list['id']], $this->folders[$list['id']]);
+                $this->ui->list_editform($action, $this->lists[$list['id']], $this->folders[$list['id']]);
                 exit;
 
             case 'new':
@@ -1061,11 +1114,11 @@ class kolab_notes extends rcube_plugin
                     $list['_reload'] = $list['parent'] != $oldparent;
 
                     // compose the new display name
-                    $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
-                    $path_imap = explode($delim, $newfolder);
+                    $delim            = $this->rc->get_storage()->get_hierarchy_delimiter();
+                    $path_imap        = explode($delim, $newfolder);
                     $list['name']     = kolab_storage::object_name($newfolder);
                     $list['editname'] = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
-                    $list['listname'] = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_imap)) . '&raquo; ' . $list['editname'];
+                    $list['listname'] = $list['editname'];
                 }
                 break;
 
@@ -1098,7 +1151,7 @@ class kolab_notes extends rcube_plugin
                 }
                 // report more results available
                 if ($this->driver->search_more_results) {
-                    $this->rc->output->show_message('autocompletemore', 'info');
+                    $this->rc->output->show_message('autocompletemore', 'notice');
                 }
 
                 $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
@@ -1152,10 +1205,12 @@ class kolab_notes extends rcube_plugin
 
             foreach ($uids as $uid) {
                 if ($note = $this->get_note(array('uid' => $uid, 'list' => $list))) {
+                    $data = $this->note2message($note);
                     $args['attachments'][] = array(
                         'name'     => abbreviate_string($note['title'], 50, ''),
                         'mimetype' => 'message/rfc822',
-                        'data'     => $this->note2message($note),
+                        'data'     => $data,
+                        'size'     => strlen($data),
                     );
 
                     if (empty($args['param']['subject'])) {
@@ -1198,7 +1253,7 @@ class kolab_notes extends rcube_plugin
         // prepend note links to message body
         if ($html) {
             $this->load_ui();
-            $args['content'] = html::div('kolabmessagenotes', $html) . $args['content'];
+            $args['content'] = html::div('kolabmessagenotes boxinformation', $html) . $args['content'];
         }
 
         return $args;
@@ -1326,7 +1381,9 @@ class kolab_notes extends rcube_plugin
 
         // try to be smart and convert to plain-text if no real formatting is detected
         if (preg_match('!<body><(?:p|pre)>(.*)</(?:p|pre)></body>!Uims', $object['description'], $m)) {
-            if (!preg_match('!<(a|b|i|strong|em|p|span|div|pre|li)(\s+[a-z]|>)!im', $m[1], $n) || !strpos($m[1], '</'.$n[1].'>')) {
+            if (!preg_match('!<(a|b|i|strong|em|p|span|div|pre|li|img)(\s+[a-z]|>)!im', $m[1], $n)
+                || ($n[1] != 'img' && !strpos($m[1], '</'.$n[1].'>'))
+            ) {
                 // $converter = new rcube_html2text($m[1], false, true, 0);
                 // $object['description'] = rtrim($converter->get_text());
                 $object['description'] = html_entity_decode(preg_replace('!<br(\s+/)>!', "\n", $m[1]));
@@ -1423,4 +1480,3 @@ class kolab_notes extends rcube_plugin
     }
 
 }
-
diff --git a/plugins/kolab_notes/kolab_notes_ui.php b/plugins/kolab_notes/kolab_notes_ui.php
index 99cce46a..b39a57f4 100644
--- a/plugins/kolab_notes/kolab_notes_ui.php
+++ b/plugins/kolab_notes/kolab_notes_ui.php
@@ -22,18 +22,16 @@ class kolab_notes_ui
 
         // add taskbar button
         $this->plugin->add_button(array(
-            'command' => 'notes',
-            'class'   => 'button-notes',
-            'classsel' => 'button-notes button-selected',
+            'command'    => 'notes',
+            'class'      => 'button-notes',
+            'classsel'   => 'button-notes button-selected',
             'innerclass' => 'button-inner',
-            'label'   => 'kolab_notes.navtitle',
+            'label'      => 'kolab_notes.navtitle',
+            'type'       => 'link'
         ), 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/notes.css');
 
-        $this->plugin->register_action('print', array($this, 'print_template'));
-        $this->plugin->register_action('folder-acl', array($this, 'folder_acl'));
-
         $this->ready = true;
   }
 
@@ -42,7 +40,6 @@ class kolab_notes_ui
     */
     public function init_templates()
     {
-        $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
         $this->plugin->register_handler('plugin.notebooks', array($this, 'folders'));
         #$this->plugin->register_handler('plugin.folders_select', array($this, 'folders_select'));
         $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
@@ -56,19 +53,11 @@ class kolab_notes_ui
         $this->rc->output->include_script('list.js');
         $this->rc->output->include_script('treelist.js');
         $this->plugin->include_script('notes.js');
-
-        jqueryui::tagedit();
-
-        // include kolab folderlist widget if available
-        if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
-            $this->plugin->api->include_script('libkolab/js/folderlist.js');
-            $this->plugin->api->include_script('libkolab/js/audittrail.js');
-        }
+        $this->plugin->api->include_script('libkolab/libkolab.js');
 
         // load config options and user prefs relevant for the UI
         $settings = array(
             'sort_col' => $this->rc->config->get('kolab_notes_sort_col', 'changed'),
-            'print_template' => $this->rc->url('print'),
         );
 
         if ($list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC)) {
@@ -78,32 +67,10 @@ class kolab_notes_ui
             $settings['selected_uid'] = $uid;
         }
 
-        $lang_codes = array($_SESSION['language']);
-
-        if ($pos = strpos($_SESSION['language'], '_')) {
-            $lang_codes[] = substr($_SESSION['language'], 0, $pos);
-        }
-
-        foreach ($lang_codes as $code) {
-            if (file_exists(INSTALL_PATH . "program/js/tinymce/langs/$code.js")) {
-                $lang = $code;
-                break;
-            }
-        }
-
-        if (empty($lang)) {
-            $lang = 'en';
-        }
-
-        $settings['editor'] = array(
-            'lang'       => $lang,
-            'spellcheck' => intval($this->rc->config->get('enable_spellcheck')),
-            'spelldict'  => intval($this->rc->config->get('spellcheck_dictionary'))
-        );
+        $this->rc->html_editor();
 
         $this->rc->output->set_env('kolab_notes_settings', $settings);
-
-        $this->rc->output->add_label('save','cancel','delete','close');
+        $this->rc->output->add_label('save','cancel','delete','close','listoptionstitle');
     }
 
     public function folders($attrib)
@@ -238,24 +205,24 @@ class kolab_notes_ui
     {
         $attrib += array('id' => 'rcmkolabnoteslist');
         $this->rc->output->add_gui_object('noteslist', $attrib['id']);
-        return html::tag('ul', $attrib, '', html::$common_attrib);
-    }
-
-    public function tagslist($attrib)
-    {
-        $attrib += array('id' => 'rcmkolabnotestagslist');
-        $this->rc->output->add_gui_object('notestagslist', $attrib['id']);
-        return html::tag('ul', $attrib, '', html::$common_attrib);
+        return html::tag('table', $attrib, '<tbody></tbody>', html::$common_attrib);
     }
 
     public function editform($attrib)
     {
         $attrib += array('action' => '#', 'id' => 'rcmkolabnoteseditform');
 
-        $this->rc->output->add_gui_object('noteseditform', $attrib['id']);
-        $this->rc->output->include_script('tinymce/tinymce.min.js');
+        $textarea = new html_textarea(array(
+                'name'     => 'content',
+                'id'       => 'notecontent',
+                'cols'     => 60,
+                'rows'     => 20,
+                'tabindex' => 0,
+                'class'    => 'mce_editor form-control',
+        ));
+
+        $this->rc->output->add_gui_object('noteseditform', $attrib['id']);
 
-        $textarea = new html_textarea(array('name' => 'content', 'id' => 'notecontent', 'cols' => 60, 'rows' => 20, 'tabindex' => 0));
         return html::tag('form', $attrib, $textarea->show(), array_merge(html::$common_attrib, array('action')));
     }
 
@@ -271,16 +238,32 @@ class kolab_notes_ui
         $attrib += array('id' => 'rcmkolabnotestitle');
         $this->rc->output->add_gui_object('noteviewtitle', $attrib['id']);
 
-        $summary = new html_inputfield(array('name' => 'summary', 'class' => 'notetitle inline-edit', 'size' => 60, 'tabindex' => 0));
+        $summary = new html_inputfield(array(
+                'name'     => 'summary',
+                'class'    => 'notetitle inline-edit form-control',
+                'size'     => 60,
+                'id'       => 'notetitleinput',
+                'tabindex' => 0
+        ));
 
-        $html = $summary->show();
-        $html .= html::div(array('class' => 'tagline tagedit', 'style' => 'display:none'), '&nbsp;');
-        $html .= html::div(array('class' => 'dates', 'style' => 'display:none'),
-            html::label(array(), $this->plugin->gettext('created')) .
-            html::span('notecreated', '') .
-            html::label(array(), $this->plugin->gettext('changed')) .
-            html::span('notechanged', '')
-        );
+        $html = html::div('form-group row',
+                html::label(array('class' => 'col-sm-2 col-form-label', 'for' => 'notetitleinput'), $this->plugin->gettext('kolab_notes.title'))
+                    . html::span('col-sm-10', $summary->show())
+            )
+            . html::div('form-group row',
+                html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('kolab_notes.tags'))
+                    . html::div(array('class' => 'tagline tagedit col-sm-10'), '&nbsp;')
+            )
+            . html::div(array('class' => 'dates text-only', 'style' => 'display:none'),
+                html::div('form-group row',
+                    html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('created'))
+                    . html::span('col-sm-10', html::span('notecreated form-control-plaintext', ''))
+                )
+                . html::div('form-group row',
+                    html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('changed'))
+                    . html::span('col-sm-10', html::span('notechanged form-control-plaintext', ''))
+                )
+            );
 
         return html::div($attrib, $html);
     }
@@ -293,17 +276,25 @@ class kolab_notes_ui
     }
 
     /**
-     * Render edit for notes lists (folders)
+     * Render create/edit form for notes lists (folders)
      */
     public function list_editform($action, $list, $folder)
     {
-        if (is_object($folder)) {
-            $folder_name = $folder->name; // UTF7
-        }
-        else {
-            $folder_name = '';
-        }
+        $this->action = $action;
+        $this->list   = $list;
+        $this->folder = is_object($folder) ? $folder->name : ''; // UTF7;
 
+        $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabelnotebookform'));
+        $this->rc->output->add_handler('folderform', array($this, 'notebookform'));
+        $this->rc->output->send('libkolab.folderform');
+    }
+
+    /**
+     * Render create/edit form for notes lists (folders)
+     */
+    public function notebookform($attrib)
+    {
+        $folder_name     = $this->folder;
         $hidden_fields[] = array('name' => 'oldname', 'value' => $folder_name);
 
         $storage = $this->rc->get_storage();
@@ -319,12 +310,12 @@ class kolab_notes_ui
         }
         else {
             $path_imap = '';
-            $options = array();
+            $options   = array();
         }
 
         // General tab
         $form['properties'] = array(
-            'name' => $this->rc->gettext('properties'),
+            'name'   => $this->rc->gettext('properties'),
             'fields' => array(),
         );
 
@@ -332,8 +323,8 @@ class kolab_notes_ui
         $input_name = new html_inputfield(array('name' => 'name', 'id' => 'noteslist-name', 'size' => 20));
         $form['properties']['fields']['name'] = array(
             'label' => $this->plugin->gettext('listname'),
-            'value' => $input_name->show($list['editname'], array('disabled' => ($options['norename'] || $options['protected']))),
-            'id' => 'noteslist-name',
+            'value' => $input_name->show($this->list['editname'], array('disabled' => ($options['norename'] || $options['protected']))),
+            'id'    => 'noteslist-name',
         );
 
         // prevent user from moving folder
@@ -345,95 +336,12 @@ class kolab_notes_ui
             $form['properties']['fields']['path'] = array(
                 'label' => $this->plugin->gettext('parentfolder'),
                 'value' => $select->show(strlen($folder_name) ? $path_imap : ''),
-                'id' => 'parent-folder',
+                'id'    => 'parent-folder',
             );
         }
 
-        // add folder ACL tab
-        if ($action != 'form-new') {
-            $form['sharing'] = array(
-                'name'    => rcube::Q($this->plugin->gettext('tabsharing')),
-                'content' => html::tag('iframe', array(
-                    'src' => $this->rc->url(array('_action' => 'folder-acl', '_folder' => $folder_name, 'framed' => 1)),
-                    'width' => '100%',
-                    'height' => 280,
-                    'border' => 0,
-                    'style' => 'border:0'),
-                '')
-            );
-        }
+        $form_html = kolab_utils::folder_form($form, $folder_name, 'kolab_notes', $hidden_fields);
 
-        $form_html = '';
-        if (is_array($hidden_fields)) {
-            foreach ($hidden_fields as $field) {
-                $hiddenfield = new html_hiddenfield($field);
-                $form_html .= $hiddenfield->show() . "\n";
-            }
-        }
-
-        // create form output
-        foreach ($form as $tab) {
-            if (is_array($tab['fields']) && empty($tab['content'])) {
-                $table = new html_table(array('cols' => 2));
-                foreach ($tab['fields'] as $col => $colprop) {
-                    $label = !empty($colprop['label']) ? $colprop['label'] : $this->plugin->gettext($col);
-
-                    $table->add('title', html::label($colprop['id'], rcube::Q($label)));
-                    $table->add(null, $colprop['value']);
-                }
-                $content = $table->show();
-            }
-            else {
-                $content = $tab['content'];
-            }
-
-            if (!empty($content)) {
-                $form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) . "\n";
-            }
-        }
-
-        return html::tag('form', array('action' => "#", 'method' => "post", 'id' => "noteslistpropform"), $form_html);
+        return html::tag('form', $attrib + array('action' => '#', 'method' => 'post', 'id' => 'noteslistpropform'), $form_html);
     }
-
-    /**
-     * Handler to render ACL form for a notes folder
-     */
-    public function folder_acl()
-    {
-        $this->plugin->require_plugin('acl');
-        $this->rc->output->add_handler('folderacl', array($this, 'folder_acl_form'));
-        $this->rc->output->send('kolab_notes.kolabacl');
-    }
-
-    /**
-     * Handler for ACL form template object
-     */
-    public function folder_acl_form()
-    {
-        $folder = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_GPC);
-
-        if (strlen($folder)) {
-            $storage = $this->rc->get_storage();
-            $options = $storage->folder_info($folder);
-
-            // get sharing UI from acl plugin
-            $acl = $this->rc->plugins->exec_hook('folder_form',
-                array('form' => array(), 'options' => $options, 'name' => $folder));
-        }
-
-        return $acl['form']['sharing']['content'] ?: html::div('hint', $this->plugin->gettext('aclnorights'));
-    }
-
-    /**
-     * Render the template for printing with placeholders
-     */
-    public function print_template()
-    {
-        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
-        $this->rc->output->reset(true);
-        echo $this->rc->output->parse('kolab_notes.print', false, false);
-        exit;
-    }
-
 }
-
diff --git a/plugins/kolab_notes/localization/bg.inc b/plugins/kolab_notes/localization/bg.inc
new file mode 100644
index 00000000..e743e7aa
--- /dev/null
+++ b/plugins/kolab_notes/localization/bg.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['tags'] = 'Етикети';
+$labels['foldersubscribe'] = 'Постоянен списък';
+$labels['removelist'] = 'Премахване от списъка';
diff --git a/plugins/kolab_notes/localization/bg_BG.inc b/plugins/kolab_notes/localization/bg_BG.inc
index 463dec07..2124624c 100644
--- a/plugins/kolab_notes/localization/bg_BG.inc
+++ b/plugins/kolab_notes/localization/bg_BG.inc
@@ -1,6 +1,22 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Бележки';
+$labels['tags'] = 'Етикети';
 $labels['notes'] = 'Бележки';
+$labels['created'] = 'Създаден';
+$labels['changed'] = 'Последна промяна';
+$labels['title'] = 'Заглавие';
 $labels['listname'] = 'Име';
 $labels['tabsharing'] = 'Споделяне';
+$labels['foldersubscribe'] = 'Постоянен списък';
+$labels['findnotebooks'] = 'Find notebooks...';
+$labels['removelist'] = 'Премахни от списъка';
+$labels['removelink'] = 'Премахни е-мейл препратките';
 $labels['savingdata'] = 'Запазване на данни...';
+$labels['arialabelfoldersearchform'] = 'Notebooks search form';
diff --git a/plugins/kolab_notes/localization/ca_ES.inc b/plugins/kolab_notes/localization/ca_ES.inc
index eeb42eb2..ced3d2e6 100644
--- a/plugins/kolab_notes/localization/ca_ES.inc
+++ b/plugins/kolab_notes/localization/ca_ES.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notes';
 $labels['tags'] = 'Etiquetes';
 $labels['notes'] = 'Notes';
@@ -8,4 +15,6 @@ $labels['title'] = 'Títol';
 $labels['listname'] = 'Nom';
 $labels['tabsharing'] = 'Compartit';
 $labels['foldersubscribe'] = 'Llista permanentment';
+$labels['findnotebooks'] = 'Find notebooks...';
 $labels['savingdata'] = 'S\'estan desant les dades...';
+$labels['arialabelfoldersearchform'] = 'Notebooks search form';
diff --git a/plugins/kolab_notes/localization/cs_CZ.inc b/plugins/kolab_notes/localization/cs_CZ.inc
index 2a978d42..56d66dc9 100644
--- a/plugins/kolab_notes/localization/cs_CZ.inc
+++ b/plugins/kolab_notes/localization/cs_CZ.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Poznámky';
 $labels['tags'] = 'Značky';
 $labels['lists'] = 'Zápisníky';
@@ -51,5 +58,5 @@ $labels['arialabelnotessortmenu'] = 'Volby pro třídění seznamů poznámek';
 $labels['arialabelnotesoptionsmenu'] = 'Nabídka činností pro zápisník';
 $labels['arialabelnotebookform'] = 'Vlastnosti zápisníku';
 $labels['arialabelmessagereferences'] = 'Odkazované zprávy elektronické pošty';
-$labels['arialabelfolderearchform'] = 'Hledání zápisníků';
+$labels['arialabelfoldersearchform'] = 'Hledání zápisníků';
 $labels['arialabelnoteform'] = 'Úprava poznámky';
diff --git a/plugins/kolab_notes/localization/da_DK.inc b/plugins/kolab_notes/localization/da_DK.inc
index d0736e57..da21573a 100644
--- a/plugins/kolab_notes/localization/da_DK.inc
+++ b/plugins/kolab_notes/localization/da_DK.inc
@@ -1,8 +1,62 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Noter';
 $labels['tags'] = 'Mærker';
+$labels['lists'] = 'Notesbøger';
 $labels['notes'] = 'Noter';
+$labels['create'] = 'Ny note';
+$labels['createnote'] = 'Opret en ny note';
+$labels['send'] = 'Send';
+$labels['sendnote'] = 'Send note per e-mail';
+$labels['newnote'] = 'Ny note';
+$labels['notags'] = 'Ingen mærker';
+$labels['removetag'] = 'Fjern mærke';
+$labels['created'] = 'Oprettet';
+$labels['changed'] = 'Senest ændret';
+$labels['title'] = 'Titel';
+$labels['now'] = 'Nu';
+$labels['sortby'] = 'Sortér efter';
+$labels['newnotebook'] = 'Opret en ny notesbog';
+$labels['addnotebook'] = 'Tilføj notesbog';
+$labels['editlist'] = 'Redigér notesbog';
 $labels['listname'] = 'Navn';
 $labels['tabsharing'] = 'Deling';
+$labels['discard'] = 'Forkast';
 $labels['abort'] = 'Afbryd';
+$labels['unsavedchanges'] = 'Ændringer som ikke er gemt!';
+$labels['appendnote'] = 'Tilføj en note';
+$labels['editnote'] = 'Redigér note';
+$labels['savein'] = 'Gem i';
+$labels['foldersubscribe'] = 'Vis bestandigt';
+$labels['findnotebooks'] = 'Find notesbøger...';
+$labels['listsearchresults'] = 'Ekstra notesbøger';
+$labels['nrnotebooksfound'] = '$nr notesbøger blev fundet';
+$labels['nonotebooksfound'] = 'Fandt ingen notesbøger';
+$labels['removelist'] = 'Fjern fra listen';
+$labels['removelink'] = 'Fjern e-mailreference';
 $labels['savingdata'] = 'Gemmer data...';
+$labels['recordnotfound'] = 'Post blev ikke fundet';
+$labels['norecordsfound'] = 'Fandt ingen noter';
+$labels['nochanges'] = 'Ingen ændringer til lagring';
+$labels['entertitle'] = 'Angiv venligst en titel for denne note!';
+$labels['deletenotesconfirm'] = 'Sikker på at du vil slette de valgte noter?';
+$labels['deletenotebookconfirm'] = 'Sikker på at du vil slette denne notesbog med alle dens noter? Denne handling kan ikke fortrydes.';
+$labels['discardunsavedchanges'] = 'Den aktuelle note er endnu ikke blevet gemt. Skal ændringerne forkastes?';
+$labels['invalidlistproperties'] = 'Ugyldige egenskaber for notesbog! Angiv venligst et gyldigt navn.';
+$labels['entertitle'] = 'Angiv venligst en titel for denne note!';
+$labels['aclnorights'] = 'Du har ikke administratorrettigheder for denne notesbog.';
+$labels['arialabelnoteslist'] = 'Liste med noter';
+$labels['arialabelnotesearchform'] = 'Søgeformular for noter';
+$labels['arialabelnotesquicksearchbox'] = 'Søgeinput for noter';
+$labels['arialabelnotessortmenu'] = 'Valgmuligheder for sortering af noteliste';
+$labels['arialabelnotesoptionsmenu'] = 'Handlingsmenu for notebog';
+$labels['arialabelnotebookform'] = 'Egenskaber for notesbog';
+$labels['arialabelmessagereferences'] = 'Sammenkædede e-mailbeskeder';
+$labels['arialabelfoldersearchform'] = 'Søgeformular for notesbøger';
+$labels['arialabelnoteform'] = 'Redigeringsformular for note';
diff --git a/plugins/kolab_notes/localization/de_CH.inc b/plugins/kolab_notes/localization/de_CH.inc
index be0b5e91..8b20e83e 100644
--- a/plugins/kolab_notes/localization/de_CH.inc
+++ b/plugins/kolab_notes/localization/de_CH.inc
@@ -1,11 +1,62 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notizen';
 $labels['tags'] = 'Tags';
+$labels['lists'] = 'Notizbücher';
 $labels['notes'] = 'Notizen';
+$labels['create'] = 'Neue Notiz';
+$labels['createnote'] = 'Neue Notiz erstellen';
+$labels['send'] = 'Senden';
+$labels['sendnote'] = 'Notiz über E-Mail versenden';
+$labels['newnote'] = 'Neue Notiz';
+$labels['notags'] = 'Keine Schlagworte';
+$labels['removetag'] = 'Schlagwort entfernen';
+$labels['created'] = 'Erstellt';
+$labels['changed'] = 'Geändert';
 $labels['title'] = 'Titel';
+$labels['now'] = 'Jetzt';
+$labels['sortby'] = 'Sortieren nach';
+$labels['newnotebook'] = 'Neues Notizbuch erstellen';
+$labels['addnotebook'] = 'Notizbuch hinzufügen';
+$labels['editlist'] = 'Notizbuch bearbeiten';
 $labels['listname'] = 'Name';
 $labels['tabsharing'] = 'Freigabe';
+$labels['discard'] = 'Verwerfen';
 $labels['abort'] = 'Abbrechen';
-$labels['foldersubscribe'] = 'List permanently';
-$labels['removelist'] = 'Remove from list';
+$labels['unsavedchanges'] = 'Nicht gespeicherte Änderungen!';
+$labels['appendnote'] = 'Eine Notiz hinzufügen';
+$labels['editnote'] = 'Notiz bearbeiten';
+$labels['savein'] = 'Speichern in';
+$labels['foldersubscribe'] = 'Permanent anzeigen';
+$labels['findnotebooks'] = 'Suche Notizbücher...';
+$labels['listsearchresults'] = 'Zusätzliche Notizbücher';
+$labels['nrnotebooksfound'] = '$nr Notizbücher gefunden';
+$labels['nonotebooksfound'] = 'Keine Notizbücher gefunden';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['removelink'] = 'E-Mail-Referenz entfernen';
 $labels['savingdata'] = 'Speichere...';
+$labels['recordnotfound'] = 'Eintrag nicht gefunden';
+$labels['norecordsfound'] = 'Keine Notizen gefunden';
+$labels['nochanges'] = 'Keine Änderungen werden gespeichert';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
+$labels['deletenotesconfirm'] = 'Willst du wirklich die ausgewählten Notizen löschen?';
+$labels['deletenotebookconfirm'] = 'Willst du wirklich die ausgewählten Notizbücher löschen? Diese Aktion kann nicht rückgängig gemacht werden.';
+$labels['discardunsavedchanges'] = 'Die aktuelle Notiz wurde noch nicht gespeichert. Die Änderungen verwerfen?';
+$labels['invalidlistproperties'] = 'Ungültige Notizbuch Eigenschaften! Bitte gebe einen gültigen Namen ein.';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
+$labels['aclnorights'] = 'Dir fehlen die Administrationsrechte für dieses Notizbuch.';
+$labels['arialabelnoteslist'] = 'Notizliste';
+$labels['arialabelnotesearchform'] = 'Notizen-Suchmaske';
+$labels['arialabelnotesquicksearchbox'] = 'Notiz-Sucheingabe';
+$labels['arialabelnotessortmenu'] = 'Sortieroptionen für Notizen';
+$labels['arialabelnotesoptionsmenu'] = 'Notizbuch Aktionsmenü';
+$labels['arialabelnotebookform'] = 'Notizbucheigenschaften';
+$labels['arialabelmessagereferences'] = 'Verknüpfte E-Mail-Mitteilungen';
+$labels['arialabelfoldersearchform'] = 'Notizbücher-Suchmaske';
+$labels['arialabelnoteform'] = 'Notizbearbeitungsmaske';
diff --git a/plugins/kolab_notes/localization/de_DE.inc b/plugins/kolab_notes/localization/de_DE.inc
index 6193d021..fbf9ef01 100644
--- a/plugins/kolab_notes/localization/de_DE.inc
+++ b/plugins/kolab_notes/localization/de_DE.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notizen';
 $labels['tags'] = 'Schlagworte';
 $labels['lists'] = 'Notizbücher';
@@ -51,5 +58,5 @@ $labels['arialabelnotessortmenu'] = 'Sortieroptionen für Notizen';
 $labels['arialabelnotesoptionsmenu'] = 'Notizbuch Aktionsmenü';
 $labels['arialabelnotebookform'] = 'Notizbucheigenschaften';
 $labels['arialabelmessagereferences'] = 'Verknüpfte E-Mail-Mitteilungen';
-$labels['arialabelfolderearchform'] = 'Notizbücher-Suchmaske';
+$labels['arialabelfoldersearchform'] = 'Notizbücher-Suchmaske';
 $labels['arialabelnoteform'] = 'Notizbearbeitungsmaske';
diff --git a/plugins/kolab_notes/localization/el.inc b/plugins/kolab_notes/localization/el.inc
new file mode 100644
index 00000000..038aa987
--- /dev/null
+++ b/plugins/kolab_notes/localization/el.inc
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'Σημειώσεις';
+$labels['tags'] = 'Ετικέτες';
+$labels['notes'] = 'Σημειώσεις';
+$labels['create'] = 'Νέα σημείωση';
+$labels['createnote'] = 'Δημιουργία νέας σημείωσης';
+$labels['send'] = 'Αποστολή';
+$labels['sendnote'] = 'Αποστολή σημείωσης μέσω ηλ. αλληλογραφίας';
+$labels['newnote'] = 'Νέα σημείωση';
+$labels['notags'] = 'Καμία ετικέτα';
+$labels['removetag'] = 'Αφαίρεση ετικέτας';
+$labels['created'] = 'Δημιουργήθηκε';
+$labels['changed'] = 'Τελευταία τροποποίηση';
+$labels['title'] = 'Τίτλος';
+$labels['now'] = 'Τώρα';
+$labels['sortby'] = 'Ταξινόμηση κατά';
+$labels['listname'] = 'Όνομα';
+$labels['removelist'] = 'Αφαίρεση από την λίστα';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
diff --git a/plugins/kolab_notes/localization/en_US.inc b/plugins/kolab_notes/localization/en_US.inc
index 9bd46c5d..1dffc7aa 100644
--- a/plugins/kolab_notes/localization/en_US.inc
+++ b/plugins/kolab_notes/localization/en_US.inc
@@ -38,11 +38,13 @@ $labels['editnote'] = 'Edit Note';
 $labels['savein'] = 'Save in';
 $labels['foldersubscribe'] = 'List permanently';
 $labels['findnotebooks'] = 'Find notebooks...';
+$labels['findnotes'] = 'Find notes';
 $labels['listsearchresults'] = 'Additional notebooks';
 $labels['nrnotebooksfound'] = '$nr notebooks found';
 $labels['nonotebooksfound'] = 'No notebooks found';
 $labels['removelist'] = 'Remove from list';
 $labels['removelink'] = 'Remove email reference';
+$labels['listactions'] = 'Notebooks list actions';
 
 $labels['savingdata'] = 'Saving data...';
 $labels['recordnotfound'] = 'Record not found';
@@ -56,18 +58,6 @@ $labels['invalidlistproperties'] = 'Invalid notebook properties! Please set a va
 $labels['entertitle'] = 'Please enter a title for this note!';
 $labels['aclnorights'] = 'You do not have administrator rights for this notebook.';
 
-// history dialog
-$labels['showhistory'] = 'Show History';
-$labels['objectchangelog'] = 'Change History';
-$labels['objectdiff'] = 'Changes from $rev1 to $rev2';
-$labels['objectnotfound'] = 'Failed to load note data';
-$labels['objectchangelognotavailable'] = 'Change history is not available for this note';
-$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
-$labels['revisionrestoreconfirm'] = 'Do you really want to restore revision $rev of this note? This will replace the current note with the old version.';
-$labels['objectrestoresuccess'] = 'Revision $rev successfully restored';
-$labels['objectrestoreerror'] = 'Failed to restore the old revision';
-
-// (hidden) titles and labels for accessibility annotations
 $labels['arialabelnoteslist'] = 'List of notes';
 $labels['arialabelnotesearchform'] = 'Notes search form';
 $labels['arialabelnotesquicksearchbox'] = 'Notes search input';
@@ -75,5 +65,5 @@ $labels['arialabelnotessortmenu'] = 'Notes list sorting options';
 $labels['arialabelnotesoptionsmenu'] = 'Notebook actions menu';
 $labels['arialabelnotebookform'] = 'Notebook properties';
 $labels['arialabelmessagereferences'] = 'Linked email messages';
-$labels['arialabelfolderearchform'] = 'Notebooks search form';
+$labels['arialabelfoldersearchform'] = 'Notebooks search form';
 $labels['arialabelnoteform'] = 'Note edit form';
diff --git a/plugins/kolab_notes/localization/es_AR.inc b/plugins/kolab_notes/localization/es_AR.inc
index 480196d4..6f958996 100644
--- a/plugins/kolab_notes/localization/es_AR.inc
+++ b/plugins/kolab_notes/localization/es_AR.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notas';
 $labels['tags'] = 'Etiquetas';
 $labels['lists'] = 'Libretas de notas';
@@ -28,10 +35,13 @@ $labels['editnote'] = 'Editar nota';
 $labels['savein'] = 'Guardar en';
 $labels['foldersubscribe'] = 'Listar permanentemente';
 $labels['findnotebooks'] = 'Encontrar libretas de notas...';
+$labels['findnotes'] = 'Encontrar notas';
 $labels['listsearchresults'] = 'Libretas de notas adicionales';
 $labels['nrnotebooksfound'] = '$nr libretas de notas encontradas';
 $labels['nonotebooksfound'] = 'No se encontraron libretas de notas';
 $labels['removelist'] = 'Eliminar de la lista';
+$labels['removelink'] = 'Eliminar referencia de correo';
+$labels['listactions'] = 'Lista de acciones de libreta de notas';
 $labels['savingdata'] = 'Guardando...';
 $labels['recordnotfound'] = 'Registro no encontrado';
 $labels['norecordsfound'] = 'No se encontraron notas';
@@ -50,4 +60,5 @@ $labels['arialabelnotessortmenu'] = 'Opciones de orden de notas';
 $labels['arialabelnotesoptionsmenu'] = 'Menú de acciones de libreta de notas';
 $labels['arialabelnotebookform'] = 'Propiedades de libreta de notas';
 $labels['arialabelmessagereferences'] = 'Mensajes de email enlazados';
-$labels['arialabelfolderearchform'] = 'Formulario de búsqueda de libretas de notas';
+$labels['arialabelfoldersearchform'] = 'Formulario de búsqueda de libretas de notas';
+$labels['arialabelnoteform'] = 'Formulario de edición de nota';
diff --git a/plugins/kolab_notes/localization/es_ES.inc b/plugins/kolab_notes/localization/es_ES.inc
index 4c6c543e..9921c3cb 100644
--- a/plugins/kolab_notes/localization/es_ES.inc
+++ b/plugins/kolab_notes/localization/es_ES.inc
@@ -1,6 +1,62 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notas';
+$labels['tags'] = 'Etiquetas';
+$labels['lists'] = 'Libro de notas';
 $labels['notes'] = 'Notas';
+$labels['create'] = 'Nota nueva';
+$labels['createnote'] = 'Crear una nota nueva';
+$labels['send'] = 'Enviar';
+$labels['sendnote'] = 'Enviar nota por correo electrónico';
+$labels['newnote'] = 'Nota nueva';
+$labels['notags'] = 'Sin etiquetas';
+$labels['removetag'] = 'Eliminar etiqueta';
+$labels['created'] = 'Creado';
+$labels['changed'] = 'Última modificación';
 $labels['title'] = 'Título';
+$labels['now'] = 'Ahora';
+$labels['sortby'] = 'Ordenar por';
+$labels['newnotebook'] = 'Crear una libreta de notas nueva';
+$labels['addnotebook'] = 'Añadir libro de notas';
+$labels['editlist'] = 'Editar libro de notas';
 $labels['listname'] = 'Nombre';
+$labels['tabsharing'] = 'Compartir';
+$labels['discard'] = 'Descartar';
+$labels['abort'] = 'Abortar';
+$labels['unsavedchanges'] = 'Cambios sin guardar';
+$labels['appendnote'] = 'Añadir una nota';
+$labels['editnote'] = 'Editar nota';
+$labels['savein'] = 'Guardar en';
+$labels['foldersubscribe'] = 'Lista Permanente';
+$labels['findnotebooks'] = 'Encontrar libretas de notas...';
+$labels['listsearchresults'] = 'Libretas de direcciones adicionales';
+$labels['nrnotebooksfound'] = '$nr libreta de notas encontradas';
+$labels['nonotebooksfound'] = 'No se han encontrado libretas de notas';
+$labels['removelist'] = 'Borrar de la lista';
+$labels['removelink'] = 'Eliminar la referencia de correo electrónico';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['recordnotfound'] = 'Registro no encontrado';
+$labels['norecordsfound'] = 'notas no encontradas';
+$labels['nochanges'] = 'No se han guardado los cambios';
+$labels['entertitle'] = 'Introduzca un título para esta nota';
+$labels['deletenotesconfirm'] = '¿Está seguro de querer borrar las notas seleccionadas?';
+$labels['deletenotebookconfirm'] = '¿Está seguro de eliminar esta libreta de notas con todas sus notas? Esta acción no puede deshacerse?';
+$labels['discardunsavedchanges'] = 'Aún no se ha guardado la nota actual. ¿Descartar cambios?';
+$labels['invalidlistproperties'] = 'Las propiedades de la libreta de notas no son válidas. Establezca un nombre válido.';
+$labels['entertitle'] = 'Introduzca un título para esta nota';
+$labels['aclnorights'] = 'Usted no tiene derechos de administrador en esta libreta de notas.';
+$labels['arialabelnoteslist'] = 'Lista de notas';
+$labels['arialabelnotesearchform'] = 'Formulario de búsqueda de notas';
+$labels['arialabelnotesquicksearchbox'] = 'Entrada de búsqueda de notas';
+$labels['arialabelnotessortmenu'] = 'Opciones de clasificación de la lista de notas';
+$labels['arialabelnotesoptionsmenu'] = 'Menú de acciones de la lista de notas';
+$labels['arialabelnotebookform'] = 'Propiedades de la lista de notas';
+$labels['arialabelmessagereferences'] = 'Mensajes de correo electrónico vinculados';
+$labels['arialabelfoldersearchform'] = 'Formulario de búsqueda de la libreta de notas';
+$labels['arialabelnoteform'] = 'Formulario de edición de la nota';
diff --git a/plugins/kolab_notes/localization/et_EE.inc b/plugins/kolab_notes/localization/et_EE.inc
index d8618a38..df3e9655 100644
--- a/plugins/kolab_notes/localization/et_EE.inc
+++ b/plugins/kolab_notes/localization/et_EE.inc
@@ -1,3 +1,43 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'Märkmed';
+$labels['tags'] = 'Sildid';
+$labels['lists'] = 'Märkmikud';
+$labels['notes'] = 'Märkmed';
+$labels['create'] = 'Uus märkus';
+$labels['createnote'] = 'Loo uus märkus';
+$labels['send'] = 'Saada';
+$labels['sendnote'] = 'Saada märkus e-postiga';
+$labels['newnote'] = 'Uus märkusUus märkus';
+$labels['notags'] = 'Silte pole';
+$labels['removetag'] = 'Eemalda silt';
+$labels['created'] = 'Loodud';
+$labels['changed'] = 'Viimati muudetud';
 $labels['title'] = 'Pealkiri';
+$labels['now'] = 'Praegu';
+$labels['sortby'] = 'Sorteeri';
+$labels['newnotebook'] = 'Loo uus märkmik';
+$labels['addnotebook'] = 'Lisa märkmik';
+$labels['editlist'] = 'Muuda märkmikku';
 $labels['listname'] = 'Nimi';
+$labels['tabsharing'] = 'Jagamine';
+$labels['discard'] = 'Loobu';
+$labels['abort'] = 'Katkesta';
+$labels['unsavedchanges'] = 'Salvestama muudatused!';
+$labels['appendnote'] = 'Lisa märkus';
+$labels['editnote'] = 'Muuda märkust';
+$labels['findnotebooks'] = 'Find notebooks...';
+$labels['findnotes'] = 'Otsi märkuseid';
+$labels['listsearchresults'] = 'Lisamärkmikud';
+$labels['nonotebooksfound'] = 'Ühtegi märkmikku ei leitud';
+$labels['removelist'] = 'Eemalda nimekirjast';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['recordnotfound'] = 'Sissekannet ei leitud';
+$labels['arialabelnotebookform'] = 'Märkmiku omadused';
+$labels['arialabelnoteform'] = 'Märkme muutmise vorm';
diff --git a/plugins/kolab_notes/localization/fi_FI.inc b/plugins/kolab_notes/localization/fi_FI.inc
index 365745fd..11995bbf 100644
--- a/plugins/kolab_notes/localization/fi_FI.inc
+++ b/plugins/kolab_notes/localization/fi_FI.inc
@@ -1,15 +1,59 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Muistiot';
 $labels['tags'] = 'Tunnisteet';
+$labels['lists'] = 'Muistikirjat';
 $labels['notes'] = 'Muistiot';
+$labels['create'] = 'Uusi muistio';
+$labels['createnote'] = 'Luo uusi muistio';
+$labels['send'] = 'Lähetä';
+$labels['sendnote'] = 'Lähetä muistio sähköpostitse';
+$labels['newnote'] = 'Luo uusi muistio';
+$labels['notags'] = 'Ei tunnisteita';
 $labels['removetag'] = 'Poista tunniste';
 $labels['created'] = 'Luotu';
 $labels['changed'] = 'Viimeksi muokattu';
 $labels['title'] = 'Nimi';
+$labels['now'] = 'Nyt';
+$labels['sortby'] = 'Lajittelujärjestys';
+$labels['newnotebook'] = 'Luo uusi muistikirja';
+$labels['addnotebook'] = 'Lisää muistikirja';
+$labels['editlist'] = 'Muokkaa muistikirjaa';
 $labels['listname'] = 'Nimi';
 $labels['tabsharing'] = 'Jakaminen';
+$labels['discard'] = 'Hylkää';
 $labels['abort'] = 'Keskeytä';
+$labels['unsavedchanges'] = 'Tallentamattomia muutoksia!';
+$labels['appendnote'] = 'Lisää muistio';
+$labels['editnote'] = 'Muokkaa muistiota';
+$labels['savein'] = 'Tallenna kohteeseen';
 $labels['foldersubscribe'] = 'Luetteloi pysyvästi';
+$labels['findnotebooks'] = 'Etsi muistikirjoja...';
+$labels['findnotes'] = 'Etsi muistioita';
+$labels['listsearchresults'] = 'Lisämuistikirjat';
+$labels['nrnotebooksfound'] = '$nr muistikirjaa löytyi';
+$labels['nonotebooksfound'] = 'Muistikirjoja ei löytynyt';
 $labels['removelist'] = 'Poista listasta';
 $labels['removelink'] = 'Poista sähköpostiviittaus';
 $labels['savingdata'] = 'Tallennetaan tietoja...';
+$labels['norecordsfound'] = 'Muistioita ei löytynyt';
+$labels['nochanges'] = 'Ei muutoksia tallennettavaksi';
+$labels['entertitle'] = 'Anna nimi tälle muistiolle!';
+$labels['deletenotesconfirm'] = 'Haluatko varmasti poistaa valitut muistiot?';
+$labels['deletenotebookconfirm'] = 'Haluatko varmasti poistaa muistikirjan ja kaikki siihen kuuluvat muistiot? Tätä toimenpidettä ei voi perua.';
+$labels['discardunsavedchanges'] = 'Nykyistiä muistiota ei ole tannettu. Hylätäänkö muutokset?';
+$labels['invalidlistproperties'] = 'Virheelliset muistikirjan ominaisuudet! Aseta muistikirjalle kelvollinen nimi.';
+$labels['entertitle'] = 'Anna nimi tälle muistiolle!';
+$labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän muistikirjaan.';
+$labels['arialabelnotesearchform'] = 'Muistioiden hakulomake';
+$labels['arialabelnotesoptionsmenu'] = 'Muistikirjan toimenpidevalikko';
+$labels['arialabelnotebookform'] = 'Muistikirjan ominaisuudet';
+$labels['arialabelmessagereferences'] = 'Linkitetyt sähköpostiviestit';
+$labels['arialabelfoldersearchform'] = 'Muistikirjojen hakulomake';
+$labels['arialabelnoteform'] = 'Muistion muokkauslomake';
diff --git a/plugins/kolab_notes/localization/fr_FR.inc b/plugins/kolab_notes/localization/fr_FR.inc
index 4b3a1a6b..46cb78c1 100644
--- a/plugins/kolab_notes/localization/fr_FR.inc
+++ b/plugins/kolab_notes/localization/fr_FR.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notes';
 $labels['tags'] = 'Étiquettes';
 $labels['lists'] = 'Carnets';
@@ -10,7 +17,7 @@ $labels['sendnote'] = 'Envoyer la note par mail';
 $labels['newnote'] = 'Nouvelle note';
 $labels['notags'] = 'Pas d\'étiquette';
 $labels['removetag'] = 'Supprimer l\'étiquette';
-$labels['created'] = 'Créée';
+$labels['created'] = 'Créé';
 $labels['changed'] = 'Dernière modification';
 $labels['title'] = 'Titre';
 $labels['now'] = 'Maintenant';
@@ -31,24 +38,25 @@ $labels['findnotebooks'] = 'Rechercher carnets...';
 $labels['listsearchresults'] = 'Carnets supplémentaires';
 $labels['nrnotebooksfound'] = '$nr carnets touvés';
 $labels['nonotebooksfound'] = 'Pas de carnet trouvé';
-$labels['removelist'] = 'supprimer de la liste';
+$labels['removelist'] = 'Supprimer de la liste';
 $labels['removelink'] = 'Supprimer référence d\'e-mail';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['recordnotfound'] = 'Enregistrement non trouvé';
-$labels['norecordsfound'] = 'Pas de notes trouvées';
+$labels['norecordsfound'] = 'Pas de note trouvée';
 $labels['nochanges'] = 'Aucun changement à sauvegarder';
 $labels['entertitle'] = 'Saisissez un titre pour cette note !';
 $labels['deletenotesconfirm'] = 'Voulez-vous vraiment supprimer les notes selectionnées ?';
-$labels['deletenotebookconfirm'] = 'Voulez vous vraiment supprimer ce carnet ainsi que toutes ces notes ? Cette action est irréversible.';
+$labels['deletenotebookconfirm'] = 'Voulez vous vraiment supprimer ce carnet et toutes ses notes ? Cette action est irréversible.';
 $labels['discardunsavedchanges'] = 'Cette note n\'a pas été sauvegardée. Voulez-vous abandonner les changements ?';
 $labels['invalidlistproperties'] = 'Propriétés du carnet invalide. Saisissez un nom valide.';
 $labels['entertitle'] = 'Saisissez un titre pour cette note !';
 $labels['aclnorights'] = 'Vous ne disposez pas des droits pour administrer ce carnet.';
 $labels['arialabelnoteslist'] = 'Liste des notes';
-$labels['arialabelnotesearchform'] = 'Recherche de notes avancé';
+$labels['arialabelnotesearchform'] = 'Formulaire de recherche de notes';
 $labels['arialabelnotesquicksearchbox'] = 'Champ de recherche des notes';
 $labels['arialabelnotessortmenu'] = 'Options de tri de la liste de notes';
 $labels['arialabelnotesoptionsmenu'] = 'Menu des actions pour un carnet';
 $labels['arialabelnotebookform'] = 'Propriétés du carnet';
-$labels['arialabelmessagereferences'] = 'Mails liés';
-$labels['arialabelfolderearchform'] = 'Masque de recherche des carnets';
+$labels['arialabelmessagereferences'] = 'Courriels liés';
+$labels['arialabelfoldersearchform'] = 'Masque de recherche des carnets';
+$labels['arialabelnoteform'] = 'Zone d\'édition de note';
diff --git a/plugins/kolab_notes/localization/hr_HR.inc b/plugins/kolab_notes/localization/hr_HR.inc
new file mode 100644
index 00000000..974b043f
--- /dev/null
+++ b/plugins/kolab_notes/localization/hr_HR.inc
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['listname'] = 'Name';
+$labels['tabsharing'] = 'Sharing';
+$labels['foldersubscribe'] = 'List permanently';
+$labels['removelist'] = 'Remove from list';
+$labels['savingdata'] = 'Saving data...';
diff --git a/plugins/kolab_notes/localization/hu_HU.inc b/plugins/kolab_notes/localization/hu_HU.inc
index 62809164..695ca700 100644
--- a/plugins/kolab_notes/localization/hu_HU.inc
+++ b/plugins/kolab_notes/localization/hu_HU.inc
@@ -1,7 +1,16 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Jegyzetek';
 $labels['tags'] = 'Kulcsszavak';
 $labels['notes'] = 'Jegyzetek';
 $labels['listname'] = 'Név';
 $labels['tabsharing'] = 'Megosztás';
+$labels['findnotebooks'] = 'Find notebooks...';
 $labels['savingdata'] = 'Adatok mentése...';
+$labels['arialabelfoldersearchform'] = 'Notebooks search form';
diff --git a/plugins/kolab_notes/localization/it_IT.inc b/plugins/kolab_notes/localization/it_IT.inc
index 25f7963a..c35a4641 100644
--- a/plugins/kolab_notes/localization/it_IT.inc
+++ b/plugins/kolab_notes/localization/it_IT.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Note';
 $labels['tags'] = 'Etichette';
 $labels['notes'] = 'Note';
diff --git a/plugins/kolab_notes/localization/ja_JP.inc b/plugins/kolab_notes/localization/ja_JP.inc
index bf516269..061e68c9 100644
--- a/plugins/kolab_notes/localization/ja_JP.inc
+++ b/plugins/kolab_notes/localization/ja_JP.inc
@@ -1,6 +1,62 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'ノート';
 $labels['tags'] = 'タグ';
+$labels['lists'] = 'ノートブック';
 $labels['notes'] = 'ノート';
+$labels['create'] = '新しいノート';
+$labels['createnote'] = '新しいノートの作成';
+$labels['send'] = '送信';
+$labels['sendnote'] = 'Eメールでノートを送信';
+$labels['newnote'] = '新しいノート';
+$labels['notags'] = 'タグなし';
+$labels['removetag'] = 'タグを削除';
+$labels['created'] = '作成済';
+$labels['changed'] = '最終変更';
 $labels['title'] = 'タイトル';
+$labels['now'] = '現在';
+$labels['sortby'] = '並び替え';
+$labels['newnotebook'] = '新しいノートブックの作成';
+$labels['addnotebook'] = 'ノートブックの追加';
+$labels['editlist'] = 'ノートブックの編集';
+$labels['listname'] = '名前';
+$labels['tabsharing'] = '共有';
+$labels['discard'] = '捨てる';
+$labels['abort'] = '中止';
+$labels['unsavedchanges'] = '保存していない変更あり!';
+$labels['appendnote'] = 'ノートを追加';
+$labels['editnote'] = 'ノートを保存';
+$labels['savein'] = '…に保存';
+$labels['foldersubscribe'] = '持続的なもののリスト';
+$labels['findnotebooks'] = 'ノートブックを探す…';
+$labels['listsearchresults'] = '追加のノートブック';
+$labels['nrnotebooksfound'] = '$nr 個のノートブックがみつかりました';
+$labels['nonotebooksfound'] = 'ノートブックは見つかりませんでした';
+$labels['removelist'] = 'リストから削除';
+$labels['removelink'] = 'Eメール引用文の削除';
 $labels['savingdata'] = 'データを保存中…';
+$labels['recordnotfound'] = 'レコードは見つかりませんでした';
+$labels['norecordsfound'] = 'ノートは見つかりませんでした';
+$labels['nochanges'] = '保存される変更はありません';
+$labels['entertitle'] = 'このノートのタイトルを入力してください!';
+$labels['deletenotesconfirm'] = '本当に選択したノートを削除しますか?';
+$labels['deletenotebookconfirm'] = '本当にすべてのノートとともにこのノートブックを削除しますか?この操作は元に戻せません。';
+$labels['discardunsavedchanges'] = '現在のノートはまだ保存されていません。変更を破棄しますか?';
+$labels['invalidlistproperties'] = '無効なノートブックのプロパティです!有効な名前を設定してください。';
+$labels['entertitle'] = 'このノートのタイトルを入力してください!';
+$labels['aclnorights'] = 'このノートブックに対する管理権限がありません。';
+$labels['arialabelnoteslist'] = 'ノートのリスト';
+$labels['arialabelnotesearchform'] = 'ノート検索フォーム';
+$labels['arialabelnotesquicksearchbox'] = 'ノート検索入力';
+$labels['arialabelnotessortmenu'] = 'ノートリスト並び替えオプション';
+$labels['arialabelnotesoptionsmenu'] = 'ノートブック操作メニュー';
+$labels['arialabelnotebookform'] = 'ノートブックプロパティ';
+$labels['arialabelmessagereferences'] = 'Eメールメッセージをリンク';
+$labels['arialabelfoldersearchform'] = 'ノートブック検索フォーム';
+$labels['arialabelnoteform'] = 'ノート編集フォーム';
diff --git a/plugins/kolab_notes/localization/ko_KR.inc b/plugins/kolab_notes/localization/ko_KR.inc
new file mode 100644
index 00000000..16170f68
--- /dev/null
+++ b/plugins/kolab_notes/localization/ko_KR.inc
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['created'] = '작성됨';
+$labels['changed'] = '마지막으로 수정됨';
+$labels['listname'] = '이름';
+$labels['removelist'] = '목록에서 삭제';
+$labels['savingdata'] = '자료 저장중...';
diff --git a/plugins/kolab_notes/localization/lv.inc b/plugins/kolab_notes/localization/lv.inc
new file mode 100644
index 00000000..4d7686a1
--- /dev/null
+++ b/plugins/kolab_notes/localization/lv.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['created'] = 'Izveidots';
+$labels['changed'] = 'Mainīts';
+$labels['listname'] = 'Nosaukums';
+$labels['tabsharing'] = 'Dalīšanās';
+$labels['foldersubscribe'] = 'Rādīt sarakstā vienmēr';
+$labels['removelist'] = 'Dzēst no saraksta';
+$labels['removelink'] = 'Noņemt atsauci uz e-pastu';
+$labels['savingdata'] = 'Saglabājam...';
diff --git a/plugins/kolab_notes/localization/nl_NL.inc b/plugins/kolab_notes/localization/nl_NL.inc
index a28ba0d9..5aa9e85f 100644
--- a/plugins/kolab_notes/localization/nl_NL.inc
+++ b/plugins/kolab_notes/localization/nl_NL.inc
@@ -1,7 +1,62 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notities';
+$labels['tags'] = 'Tags';
+$labels['lists'] = 'Notitieblokken';
 $labels['notes'] = 'Notities';
+$labels['create'] = 'Nieuwe notitie';
+$labels['createnote'] = 'Nieuwe notitie maken';
+$labels['send'] = 'Versturen';
+$labels['sendnote'] = 'Notitie versturen per e-mail';
+$labels['newnote'] = 'Nieuwe notitie';
+$labels['notags'] = 'Geen tags';
+$labels['removetag'] = 'Tag verwijderen';
+$labels['created'] = 'Gemaakt op';
+$labels['changed'] = 'Laatst gewijzigd op';
+$labels['title'] = 'Naam';
+$labels['now'] = 'Nu';
+$labels['sortby'] = 'Sorteren op';
+$labels['newnotebook'] = 'Nieuw notitieblok maken';
+$labels['addnotebook'] = 'Notitieblok toevoegen';
+$labels['editlist'] = 'Notitieblok bewerken';
 $labels['listname'] = 'Naam';
 $labels['tabsharing'] = 'Delen';
-$labels['foldersubscribe'] = 'Permanent weergeven';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
+$labels['discard'] = 'Verwijderen';
+$labels['abort'] = 'Afbreken';
+$labels['unsavedchanges'] = 'Niet-opgeslagen wijzigingen!';
+$labels['appendnote'] = 'Notitie toevoegen';
+$labels['editnote'] = 'Notitie bewerken';
+$labels['savein'] = 'Opslaan in';
+$labels['foldersubscribe'] = 'Definitief weergeven';
+$labels['findnotebooks'] = 'Notitieblokken zoeken...';
+$labels['listsearchresults'] = 'Extra notitieblokken';
+$labels['nrnotebooksfound'] = '$nr notitieblokken gevonden';
+$labels['nonotebooksfound'] = 'Geen notitieblokken gevonden';
+$labels['removelist'] = 'Verwijderen uit lijst';
+$labels['removelink'] = 'E-mailreferentie verwijderen';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['recordnotfound'] = 'Record niet gevonden';
+$labels['norecordsfound'] = 'Geen notities gevonden';
+$labels['nochanges'] = 'Geen wijzigingen om op te slaan';
+$labels['entertitle'] = 'Voer een naam voor deze notitie in!';
+$labels['deletenotesconfirm'] = 'Weet u zeker dat u de geselecteerde notities wilt verwijderen?';
+$labels['deletenotebookconfirm'] = 'Weet u zeker dat u dit notitieblok met alle notities erin wilt verwijderen? Deze actie kunt u niet ongedaan maken.';
+$labels['discardunsavedchanges'] = 'De huidige notitie is nog niet opgeslagen. Wilt u de wijzigingen verwijderen?';
+$labels['invalidlistproperties'] = 'Ongeldige eigenschappen van notitieblok! Stel een geldige naam in.';
+$labels['entertitle'] = 'Voer een naam voor deze notitie in!';
+$labels['aclnorights'] = 'U hebt geen administratorrechten voor dit notitieblok.';
+$labels['arialabelnoteslist'] = 'Lijst met notities';
+$labels['arialabelnotesearchform'] = 'Zoekformulier voor notities';
+$labels['arialabelnotesquicksearchbox'] = 'Zoekopdracht voor notities';
+$labels['arialabelnotessortmenu'] = 'Sorteeropties voor lijst met notities';
+$labels['arialabelnotesoptionsmenu'] = 'Actiemenu voor notitieblok';
+$labels['arialabelnotebookform'] = 'Eigenschappen van notitieblok';
+$labels['arialabelmessagereferences'] = 'Gekoppelde e-mailberichten';
+$labels['arialabelfoldersearchform'] = 'Zoekformulier voor notitieblokken';
+$labels['arialabelnoteform'] = 'Formulier voor bewerking van notities';
diff --git a/plugins/kolab_notes/localization/pl_PL.inc b/plugins/kolab_notes/localization/pl_PL.inc
index 3e916ba5..b1fcd39d 100644
--- a/plugins/kolab_notes/localization/pl_PL.inc
+++ b/plugins/kolab_notes/localization/pl_PL.inc
@@ -1,55 +1,18 @@
 <?php
-$labels['navtitle'] = 'Notatki';
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['tags'] = 'Tagi';
-$labels['lists'] = 'Notatniki';
-$labels['notes'] = 'Notatki';
-$labels['create'] = 'Nowa notatka';
-$labels['createnote'] = 'Utwórz nową notatkę';
-$labels['send'] = 'Wyślij';
-$labels['sendnote'] = 'Wyślij notatkę e-mailem';
-$labels['newnote'] = 'Nowa notatka';
-$labels['notags'] = 'Brak tagów';
-$labels['removetag'] = 'Usuń tag';
-$labels['created'] = 'Utworzono';
+$labels['created'] = 'Utworzone';
 $labels['changed'] = 'Ostatnia modyfikacja';
 $labels['title'] = 'Tytuł';
-$labels['now'] = 'Teraz';
-$labels['sortby'] = 'Sortuj wg';
-$labels['newnotebook'] = 'Utwórz nowy notatnik';
-$labels['addnotebook'] = 'Dodaj notatnik';
-$labels['editlist'] = 'Edytuj notatnik';
 $labels['listname'] = 'Nazwa';
 $labels['tabsharing'] = 'Udostępnianie';
-$labels['discard'] = 'Odrzuć';
-$labels['abort'] = 'Przerwij';
-$labels['unsavedchanges'] = 'Niezapisane zmiany!';
-$labels['appendnote'] = 'Dodaj notatkę';
-$labels['editnote'] = 'Edytuj notatkę';
-$labels['savein'] = 'Zapisz w';
 $labels['foldersubscribe'] = 'Dodaj do listy na stałe';
-$labels['findnotebooks'] = 'Wyszukaj notatniki...';
-$labels['listsearchresults'] = 'Dodatkowe notatniki';
-$labels['nrnotebooksfound'] = 'znaleziono $n notatników';
-$labels['nonotebooksfound'] = 'Nie znaleziono żadnych notatników';
-$labels['removelist'] = 'Remove from list';
-$labels['removelink'] = 'Remove email reference';
+$labels['removelist'] = 'Usuń z listy';
+$labels['removelink'] = 'Usuń odnośnik e-mail';
 $labels['savingdata'] = 'Zapisuję dane...';
-$labels['recordnotfound'] = 'Nie znaleziono rekordu';
-$labels['norecordsfound'] = 'Nie znaleziono żadnych notatek';
-$labels['nochanges'] = 'Brak zmian do zapisania';
-$labels['entertitle'] = 'Proszę wprowadzić tytuł tej notatki!';
-$labels['deletenotesconfirm'] = 'Czy na pewno chcesz usunąć wybrane notatki?';
-$labels['deletenotebookconfirm'] = 'Czy na pewno chcesz usunąć ten notatnik z wszystkimi notatkami? Ta operacja jest nieodwracalna.';
-$labels['discardunsavedchanges'] = 'Bieżąca notatka nie została jeszcze zapisana. Porzucić zmiany?';
-$labels['invalidlistproperties'] = 'Błędne właściwości notatnika! Proszę wprowadzić poprawną nazwę.';
-$labels['entertitle'] = 'Proszę wprowadzić tytuł tej notatki!';
-$labels['aclnorights'] = 'Nie posiadasz uprawnień administracyjnych do tego notatnika.';
-$labels['arialabelnoteslist'] = 'Lista notatek';
-$labels['arialabelnotesearchform'] = 'Formularz wyszukiwania notatek';
-$labels['arialabelnotesquicksearchbox'] = 'Fraza wyszukiwania';
-$labels['arialabelnotessortmenu'] = 'Opcje sortowania listy notatek';
-$labels['arialabelnotesoptionsmenu'] = 'Menu akcji notatników';
-$labels['arialabelnotebookform'] = 'Właściwości notatnika';
-$labels['arialabelmessagereferences'] = 'Powiązane wiadomości e-mail';
-$labels['arialabelfolderearchform'] = 'Formularz wyszukiwania notatników';
-$labels['arialabelnoteform'] = 'Note edit form';
diff --git a/plugins/kolab_notes/localization/pt_BR.inc b/plugins/kolab_notes/localization/pt_BR.inc
index 247a756b..457facd1 100644
--- a/plugins/kolab_notes/localization/pt_BR.inc
+++ b/plugins/kolab_notes/localization/pt_BR.inc
@@ -1,9 +1,22 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['tags'] = 'Etiquetas';
 $labels['notes'] = 'Notas';
+$labels['created'] = 'Criado';
+$labels['changed'] = 'Última modificação';
 $labels['title'] = 'Título';
 $labels['listname'] = 'Nome';
 $labels['tabsharing'] = 'Compartilhamento';
 $labels['abort'] = 'Abortar';
 $labels['foldersubscribe'] = 'Listar permanentemente';
+$labels['findnotebooks'] = 'Find notebooks...';
+$labels['removelist'] = 'Remover da lista';
+$labels['removelink'] = 'Remover referência do email';
 $labels['savingdata'] = 'Salvando dados...';
+$labels['arialabelfoldersearchform'] = 'Notebooks search form';
diff --git a/plugins/kolab_notes/localization/pt_PT.inc b/plugins/kolab_notes/localization/pt_PT.inc
index 19b0718c..4bced76b 100644
--- a/plugins/kolab_notes/localization/pt_PT.inc
+++ b/plugins/kolab_notes/localization/pt_PT.inc
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'Notas';
+$labels['notes'] = 'Notas';
 $labels['listname'] = 'Nome';
 $labels['tabsharing'] = 'Compartilhamento';
 $labels['foldersubscribe'] = 'Listar permanentemente';
diff --git a/plugins/kolab_notes/localization/ru_RU.inc b/plugins/kolab_notes/localization/ru_RU.inc
index 5371bb1f..07bfec1d 100644
--- a/plugins/kolab_notes/localization/ru_RU.inc
+++ b/plugins/kolab_notes/localization/ru_RU.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Заметки';
 $labels['tags'] = 'Теги';
 $labels['lists'] = 'Записные книжки';
@@ -48,8 +55,7 @@ $labels['arialabelnoteslist'] = 'Список заметок';
 $labels['arialabelnotesearchform'] = 'Форма поиска заметок';
 $labels['arialabelnotesquicksearchbox'] = 'Поиск заметок';
 $labels['arialabelnotessortmenu'] = 'Настройки сортировки списка заметок';
-$labels['arialabelnotesoptionsmenu'] = 'Действия с записными книжками';
 $labels['arialabelnotebookform'] = 'Свойства записной книжки';
 $labels['arialabelmessagereferences'] = 'Связанные сообщения почты';
-$labels['arialabelfolderearchform'] = 'Форма поиска записных книжек';
+$labels['arialabelfoldersearchform'] = 'Форма поиска записных книжек';
 $labels['arialabelnoteform'] = 'Форма редактирования заметок';
diff --git a/plugins/kolab_notes/localization/sk_SK.inc b/plugins/kolab_notes/localization/sk_SK.inc
new file mode 100644
index 00000000..24725227
--- /dev/null
+++ b/plugins/kolab_notes/localization/sk_SK.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['listname'] = 'Meno';
+$labels['removelist'] = 'Odstrániť zo zoznamu';
diff --git a/plugins/kolab_notes/localization/sl_SI.inc b/plugins/kolab_notes/localization/sl_SI.inc
new file mode 100644
index 00000000..8c48cd75
--- /dev/null
+++ b/plugins/kolab_notes/localization/sl_SI.inc
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'Zapiski';
+$labels['tags'] = 'Tagi';
+$labels['lists'] = 'Beležke';
+$labels['notes'] = 'Zapiski';
+$labels['create'] = 'Nov zapisek';
+$labels['createnote'] = 'Ustvari nov zapis';
+$labels['send'] = 'Pošlji';
+$labels['sendnote'] = 'Pošlji zapisek v emailu';
+$labels['newnote'] = 'Nov zapisek';
+$labels['notags'] = 'Ni tagov';
+$labels['removetag'] = 'Odstrani tag';
+$labels['created'] = 'Ustvarjeno';
+$labels['changed'] = 'Nazadnje urejeno';
+$labels['title'] = 'Naslov';
+$labels['now'] = 'Zdaj';
+$labels['sortby'] = 'Sortiraj po';
+$labels['newnotebook'] = 'Ustvari novo beležko';
+$labels['addnotebook'] = 'Dodaj beležko';
+$labels['editlist'] = 'Uredi beležko';
+$labels['listname'] = 'Ime';
+$labels['tabsharing'] = 'Deli z ostalimi';
+$labels['discard'] = 'Prekliči';
+$labels['abort'] = 'Prekini';
+$labels['unsavedchanges'] = 'Neshranjene Spremembe!';
+$labels['appendnote'] = 'Dodaj zapisek';
+$labels['editnote'] = 'Uredi zapisek';
+$labels['savein'] = 'Shrani v';
+$labels['foldersubscribe'] = 'Označi za vedno';
+$labels['findnotebooks'] = 'Poišči beležke...';
+$labels['listsearchresults'] = 'Dodatne beležke';
+$labels['nrnotebooksfound'] = '$nr najdenih beležk';
+$labels['nonotebooksfound'] = 'Ni najdenih beležk';
+$labels['removelist'] = 'Odstrani iz seznama';
+$labels['removelink'] = 'Odstrani email povezavo';
+$labels['savingdata'] = 'Shranjujem...';
+$labels['recordnotfound'] = 'Zapis ni bil najden';
+$labels['norecordsfound'] = 'Ni najdenih zapiskov';
+$labels['nochanges'] = 'Ni sprememb za shranjevanje';
+$labels['entertitle'] = 'Prosim vnesite naslov zapiska!';
+$labels['deletenotesconfirm'] = 'Ali želite potrditi brisanje zapiska?';
+$labels['deletenotebookconfirm'] = 'Ali želite potrditi brisanje beležke z vsemi zapiski? Izbris je dokončen.';
+$labels['discardunsavedchanges'] = 'Trenutni zapisek še ni bil shranjen. Prekličem spremembe?';
+$labels['invalidlistproperties'] = 'Napačne nastavitve beležke! Prosim vnesite pravilno ime.';
+$labels['entertitle'] = 'Prosim vnesite naslov zapiska!';
+$labels['aclnorights'] = 'Nimate administratorskih pravic na tej beležki.';
+$labels['arialabelnoteslist'] = 'Seznam zapiskov';
+$labels['arialabelnotesearchform'] = 'Obrazec za iskanje zapiskov';
+$labels['arialabelnotesquicksearchbox'] = 'Vnos iskanja po zapiskih';
+$labels['arialabelnotessortmenu'] = 'Nastavitve za sortiranje zapiskov';
+$labels['arialabelnotesoptionsmenu'] = 'Ukazni meni za beležke';
+$labels['arialabelnotebookform'] = 'Nastavitve beležke';
+$labels['arialabelmessagereferences'] = 'Povezana email sporočila';
+$labels['arialabelfoldersearchform'] = 'Obrazec za iskanje beležk';
+$labels['arialabelnoteform'] = 'Obrazec za urejanje zapiska';
diff --git a/plugins/kolab_notes/localization/sv_SE.inc b/plugins/kolab_notes/localization/sv_SE.inc
index e2adf9f8..4fa3842d 100644
--- a/plugins/kolab_notes/localization/sv_SE.inc
+++ b/plugins/kolab_notes/localization/sv_SE.inc
@@ -1,55 +1,28 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Anteckningar';
-$labels['tags'] = 'Etiketter';
-$labels['lists'] = 'Anteckningsböcker';
+$labels['tags'] = 'Taggar';
 $labels['notes'] = 'Anteckningar';
 $labels['create'] = 'Ny anteckning';
-$labels['createnote'] = 'Skapa en ny anteckning';
+$labels['createnote'] = 'Skapa ny anteckning';
 $labels['send'] = 'Skicka';
-$labels['sendnote'] = 'Skicka anteckning med e-post';
+$labels['sendnote'] = 'Skicka anteckning med email';
 $labels['newnote'] = 'Ny anteckning';
-$labels['notags'] = 'Inga etiketter';
-$labels['removetag'] = 'Ta bort etikett';
+$labels['notags'] = 'Inga taggar';
+$labels['removetag'] = 'Ta bort tagg';
 $labels['created'] = 'Skapad';
 $labels['changed'] = 'Senast ändrad';
 $labels['title'] = 'Titel';
 $labels['now'] = 'Nu';
-$labels['sortby'] = 'Sortera enligt';
-$labels['newnotebook'] = 'Skapa en ny anteckningsbok';
-$labels['addnotebook'] = 'Lägg till anteckningsbok';
-$labels['editlist'] = 'Redigera anteckningsbok';
 $labels['listname'] = 'Namn';
 $labels['tabsharing'] = 'Delning';
-$labels['discard'] = 'Kassera';
-$labels['abort'] = 'Avbryt';
-$labels['unsavedchanges'] = 'Ej sparade ändringar!';
-$labels['appendnote'] = 'Lägg till en anteckning';
-$labels['editnote'] = 'Redigera anteckning';
-$labels['savein'] = 'Spara i';
 $labels['foldersubscribe'] = 'Lista permanent';
-$labels['findnotebooks'] = 'Hitta anteckningsböcker ...';
-$labels['listsearchresults'] = 'Ytterligare anteckningsböcker';
-$labels['nrnotebooksfound'] = '$nr anteckningsböcker hittades';
-$labels['nonotebooksfound'] = 'Inga anteckningsböcker hittades';
 $labels['removelist'] = 'Ta bort från lista';
 $labels['removelink'] = 'Ta bort e-postreferens';
 $labels['savingdata'] = 'Sparar data ...';
-$labels['recordnotfound'] = 'Hittade inte post';
-$labels['norecordsfound'] = 'Inga anteckningar hittades';
-$labels['nochanges'] = 'Inga ändringar att spara';
-$labels['entertitle'] = 'Vänligen ange en titel för denna anteckning!';
-$labels['deletenotesconfirm'] = 'Vill du verkligen ta bort valda anteckningar?';
-$labels['deletenotebookconfirm'] = 'Vill du verkligen ta denna anteckningsbok med alla anteckningar? Denna åtgärd kan inte ångras.';
-$labels['discardunsavedchanges'] = 'Den nuvarande anteckningen har inte sparats än. Ignorera ändringarna?';
-$labels['invalidlistproperties'] = 'Ogiltiga egenskaper för anteckningsbok! Vänligen ange ett giltigt namn.';
-$labels['entertitle'] = 'Vänligen ange en titel för denna anteckning!';
-$labels['aclnorights'] = 'Du har inte administratörsrättigheter för denna anteckningsbok.';
-$labels['arialabelnoteslist'] = 'Lista med anteckningar';
-$labels['arialabelnotesearchform'] = 'Sökformulär för anteckningar';
-$labels['arialabelnotesquicksearchbox'] = 'Sökinmatning för anteckningar';
-$labels['arialabelnotessortmenu'] = 'Sorteringsalternativ för anteckningslista';
-$labels['arialabelnotesoptionsmenu'] = 'Åtgärdsmeny för anteckningsbok';
-$labels['arialabelnotebookform'] = 'Egenskaper för anteckningsbok';
-$labels['arialabelmessagereferences'] = 'Länkade e-postmeddelanden';
-$labels['arialabelfolderearchform'] = 'Sökformulär för anteckningsböcker';
-$labels['arialabelnoteform'] = 'Redigeringsformulär för anteckning';
diff --git a/plugins/kolab_notes/localization/th_TH.inc b/plugins/kolab_notes/localization/th_TH.inc
new file mode 100644
index 00000000..e1c45113
--- /dev/null
+++ b/plugins/kolab_notes/localization/th_TH.inc
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'สมุดจด';
+$labels['tags'] = 'แท็ก';
+$labels['lists'] = 'สมุดบันทึก';
+$labels['notes'] = 'บันทึก';
+$labels['create'] = 'บันทึกใหม่';
+$labels['createnote'] = 'สร้างบันทึกใหม่';
+$labels['send'] = 'จัดส่ง';
+$labels['sendnote'] = 'ส่งบันทึกทางอีเมล์';
+$labels['newnote'] = 'สร้างบันทึกใหม่';
+$labels['removetag'] = 'ยกเลิกแท็ก';
+$labels['created'] = 'สร้างเมื่อ';
+$labels['changed'] = 'แก้ไขครั้งสุดท้ายเมื่อ';
+$labels['title'] = 'หัวข้อ';
+$labels['now'] = 'ขณะนี้';
+$labels['sortby'] = 'จัดเรียงโดย';
+$labels['newnotebook'] = 'สร้างสมุดบันทึกใหม่';
+$labels['addnotebook'] = 'เพิ่่มสมุดบันทึก';
+$labels['editlist'] = 'แก้ไขสมุดบันทึก';
+$labels['listname'] = 'ชื่อ';
+$labels['tabsharing'] = 'แบ่งปัน';
+$labels['discard'] = 'โยนทิ้ง';
+$labels['abort'] = 'ยกเลิก';
+$labels['unsavedchanges'] = 'การเปลี่ยนที่ยังไม่รับรับการบันทึก';
+$labels['appendnote'] = 'เพิ่มบันทึก';
+$labels['editnote'] = 'แก้ไขบันทึก';
+$labels['savein'] = 'จัดเก็บใน';
+$labels['foldersubscribe'] = 'แสดงเป็นรายการถาวร';
+$labels['findnotebooks'] = 'ค้นหาสมุดบันทึก...';
+$labels['listsearchresults'] = 'สมุดบันทึกเพิ่มเติม';
+$labels['nrnotebooksfound'] = 'พบสมุดบันทึก $nr เล่ม';
+$labels['nonotebooksfound'] = 'ไม่พบสมุดบันทึก';
+$labels['removelist'] = 'ลบออกจากรายการ';
+$labels['savingdata'] = 'กำลังจัดเก็บข้อมูล...';
+$labels['recordnotfound'] = 'ไม่พบข้อมูล';
+$labels['norecordsfound'] = 'ไม่พบบันทึกข้อความ';
+$labels['nochanges'] = 'ไม่มีการเปลี่ยนแปลงให้บันทึก';
+$labels['entertitle'] = 'โปรดป้อนหัวข้อสำหรับบันทึกฉบับนี้';
+$labels['deletenotesconfirm'] = 'คุณต้องการลบบันทีกที่เลือกนี้จริง ๆ หรือ';
+$labels['deletenotebookconfirm'] = 'คุณต้องการลบสมุดบันทึกพร้อมบันทึกทั้งหมดหรือ การทำครั้งนี้จะไม่สามารถกู้คืนได้';
+$labels['discardunsavedchanges'] = 'บันทึกแผ่นนี้ยังไม่ถูกจัดเก็บ ยกเลิกการเปลี่ยนแปลง';
+$labels['invalidlistproperties'] = 'คุณสมบัติของสมุดบันทึกไม่ถูกต้อง  โปรดตั้งชื่อให้ถูกต้อง';
+$labels['entertitle'] = 'โปรดป้อนหัวข้อสำหรับบันทึกฉบับนี้';
+$labels['aclnorights'] = 'คุณไม่มีสิทธของผู้ดูแลระบบสำหรับสมุดบันทึกเล่มนี้';
+$labels['arialabelnoteslist'] = 'รายการบันทึก';
+$labels['arialabelnotesearchform'] = 'ฟอร์มการค้นหาบันทึก';
+$labels['arialabelnotesquicksearchbox'] = 'ข้อมูลสำหรับค้นหาบันทึก';
+$labels['arialabelnotessortmenu'] = 'ทางเลือกการจัดเรียงบันทึก';
+$labels['arialabelnotebookform'] = 'คุณสมบัติของสมุดบันทึก';
+$labels['arialabelmessagereferences'] = 'ข้อความอีเมล์ที่เชื่อมต่อ';
+$labels['arialabelfoldersearchform'] = 'ฟอร์มการค้นหาสมุดบันทึก';
+$labels['arialabelnoteform'] = 'ฟอร์มการแก้ไขบันทึก';
diff --git a/plugins/kolab_notes/localization/uk_UA.inc b/plugins/kolab_notes/localization/uk_UA.inc
new file mode 100644
index 00000000..fce335ca
--- /dev/null
+++ b/plugins/kolab_notes/localization/uk_UA.inc
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'Нотатки';
+$labels['notes'] = 'Нотатки';
+$labels['created'] = 'Створена';
+$labels['changed'] = 'Змінена';
+$labels['listname'] = 'Назва';
+$labels['tabsharing'] = 'Спільне використання';
+$labels['foldersubscribe'] = 'Завжди показувати';
+$labels['removelist'] = 'Вилучити зі списку';
+$labels['savingdata'] = 'Збереження даних...';
diff --git a/plugins/kolab_notes/localization/zh_CN.inc b/plugins/kolab_notes/localization/zh_CN.inc
index ed7443fa..f592c8c8 100644
--- a/plugins/kolab_notes/localization/zh_CN.inc
+++ b/plugins/kolab_notes/localization/zh_CN.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = '笔记';
 $labels['tags'] = '标签';
 $labels['lists'] = '笔记本';
@@ -26,6 +33,7 @@ $labels['unsavedchanges'] = '更改未保存';
 $labels['appendnote'] = '增加新笔记';
 $labels['editnote'] = '编辑笔记';
 $labels['savein'] = '保存为';
+$labels['nonotebooksfound'] = '未发现笔记本';
 $labels['removelist'] = '从列表中移除';
 $labels['savingdata'] = '保存数据...';
 $labels['recordnotfound'] = '未找到记录';
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 3f6a8ab3..69852d72 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -2,11 +2,12 @@
  * Client scripts for the Kolab Notes plugin
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014-2015, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014-2017, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -35,11 +36,9 @@ function rcube_kolab_notes_ui(settings)
     var notebookslist;
     var noteslist;
     var notesdata = {};
-    var tagsfilter = [];
-    var tags = [];
+    var taglist;
     var search_request;
     var search_query;
-    var tag_draghelper;
     var render_no_focus;
     var me = this;
 
@@ -47,6 +46,8 @@ function rcube_kolab_notes_ui(settings)
     this.selected_list = null;
     this.selected_note = null;
     this.notebooks = rcmail.env.kolab_notebooks || {};
+    this.list_set_sort = list_set_sort;
+    this.settings = settings;
 
     /**
      * initialize the notes UI
@@ -55,7 +56,7 @@ function rcube_kolab_notes_ui(settings)
     {
         // register button commands
         rcmail.register_command('createnote', function(){
-            warn_unsaved_changes(function(){ edit_note(null, 'new'); })
+            warn_unsaved_changes(function(){ edit_note(null, 'new'); });
         }, false);
         rcmail.register_command('list-create', function(){ list_edit_dialog(null); }, true);
         rcmail.register_command('list-edit', function(){ list_edit_dialog(me.selected_list); }, false);
@@ -76,7 +77,7 @@ function rcube_kolab_notes_ui(settings)
         rcmail.addEventListener('plugin.update_note', update_note);
         rcmail.addEventListener('plugin.update_list', list_update);
         rcmail.addEventListener('plugin.destroy_list', list_destroy);
-        rcmail.addEventListener('plugin.unlock_saving', function(){
+        rcmail.addEventListener('plugin.unlock_saving', function() {
             if (saving_lock) {
                 rcmail.set_busy(false, null, saving_lock);
             }
@@ -105,7 +106,7 @@ function rcube_kolab_notes_ui(settings)
           id_prefix: 'rcmliknb',
           save_state: true,
           selectable: true,
-          keyboard: false,
+          keyboard: true,
           searchbox: '#notebooksearch',
           search_action: 'notes/list',
           search_sources: [ 'folders', 'users' ],
@@ -122,8 +123,9 @@ function rcube_kolab_notes_ui(settings)
                     rcmail.enable_command('createnote', has_permission(me.notebooks[id], 'i'));
                     rcmail.enable_command('list-edit', has_permission(me.notebooks[id], 'a'));
                     rcmail.enable_command('list-delete', has_permission(me.notebooks[id], 'xa'));
-                    rcmail.enable_command('list-remove', !me.notebooks[id].default);
+                    rcmail.enable_command('list-remove', !me.notebooks[id]['default']);
                     fetch_notes(id);  // sets me.selected_list
+                    rcmail.triggerEvent('show-list', {title: me.notebooks[id].listname}); // Elastic
                 },
                 function(){
                     // restore previous selection
@@ -142,7 +144,7 @@ function rcube_kolab_notes_ui(settings)
             }
         });
         notebookslist.addEventListener('remove', function(p) {
-            if (me.notebooks[p.id] && !me.notebooks[p.id].default) {
+            if (me.notebooks[p.id] && !me.notebooks[p.id]['default']) {
                 list_remove(p.id);
             }
         });
@@ -162,9 +164,16 @@ function rcube_kolab_notes_ui(settings)
             if (data.length)
                 rcmail.display_message(rcmail.gettext('nrnotebooksfound','kolab_notes').replace('$nr', data.length), 'voice');
             else
-                rcmail.display_message(rcmail.gettext('nonotebooksfound','kolab_notes'), 'info');
+                rcmail.display_message(rcmail.gettext('nonotebooksfound','kolab_notes'), 'notice');
         });
 
+        // Make Elastic checkboxes pretty
+        if (window.UI && UI.pretty_checkbox) {
+            notebookslist.addEventListener('add-item', function(prop) {
+                UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+            });
+        }
+
         $(rcmail.gui_objects.notebooks).on('click', 'div.folder > a.listname', function(e) {
             var id = String($(this).closest('li').attr('id')).replace(/^rcmliknb/, '');
             notebookslist.select(id);
@@ -194,18 +203,18 @@ function rcube_kolab_notes_ui(settings)
 
         // initialize notes list widget
         if (rcmail.gui_objects.noteslist) {
-            noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
+            rcmail.noteslist = noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
                 { multiselect:true, draggable:true, keyboard:true });
             noteslist.addEventListener('select', function(list) {
                 render_no_focus = rcube_event._last_keyboard_event && $(list.list).has(rcube_event._last_keyboard_event.target);
                 var selection_changed = list.selection.length != 1 || !me.selected_note || list.selection[0] != me.selected_note.id;
                 selection_changed && warn_unsaved_changes(function(){
                     var note;
-                    if (noteslist.selection.length == 1 && (note = notesdata[noteslist.selection[0]])) {
+                    if (!list.multi_selecting && noteslist.selection.length == 1 && (note = notesdata[noteslist.selection[0]])) {
                         edit_note(note.uid, 'edit');
                     }
                     else {
-                        reset_view();
+                        reset_view(true);
                     }
                 },
                 function(){
@@ -262,62 +271,38 @@ function rcube_kolab_notes_ui(settings)
             $('#notessortmenu a.by-' + settings.sort_col).addClass('selected');
         }
 
-        // click-handler on tags list
-        $(rcmail.gui_objects.notestagslist).on('click', 'li', function(e){
-            var item = e.target.nodeName == 'LI' ? $(e.target) : $(e.target).closest('li'),
-                tag = item.data('value');
-
-            if (!tag)
-                return false;
-
-            // reset selection on regular clicks
-            var index = $.inArray(tag, tagsfilter);
-            var shift = e.shiftKey || e.ctrlKey || e.metaKey;
-
-            if (!shift) {
-                if (tagsfilter.length > 1)
-                    index = -1;
-
-                $('li', rcmail.gui_objects.notestagslist).removeClass('selected').attr('aria-checked', 'false');
-                tagsfilter = [];
-            }
-
-            // add tag to filter
-            if (index < 0) {
-                item.addClass('selected').attr('aria-checked', 'true');
-                tagsfilter.push(tag);
-            }
-            else if (shift) {
-                item.removeClass('selected').attr('aria-checked', 'false');
-                var a = tagsfilter.slice(0,index);
-                tagsfilter = a.concat(tagsfilter.slice(index+1));
-            }
-
-            filter_notes();
-
-            // clear text selection in IE after shift+click
-            if (shift && document.selection)
-              document.selection.empty();
-
-            e.preventDefault();
-            return false;
-        })
-        .on('keypress', 'li', function(e) {
-            if (e.keyCode == 13) {
-                $(this).trigger('click', { pointerType:'keyboard' });
-            }
-        })
-        .mousedown(function(e){
-            // disable content selection with the mouse
-            e.preventDefault();
-            return false;
-        });
-
         init_editor();
 
         if (settings.selected_list) {
             notebookslist.select(settings.selected_list)
         }
+
+        rcmail.addEventListener('kolab-tags-search', filter_notes)
+            .addEventListener('kolab-tags-drop-data', function(e) { return notesdata[e.id]; })
+            .addEventListener('kolab-tags-drop', function(e) {
+                if ($(e.list).is('#kolabnoteslist')) {
+                    return;
+                }
+
+                var rec = notesdata[e.id];
+
+                if (rec && rec.id && e.tag) {
+                    savedata = me.selected_note && rec.uid == me.selected_note.uid ? get_save_data() : $.extend({}, rec);
+
+                    if (savedata.id)   delete savedata.id;
+                    if (savedata.html) delete savedata.html;
+
+                    if (!savedata.tags)
+                        savedata.tags = [];
+                    savedata.tags.push(e.tag);
+
+                    rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
+                    saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+                    rcmail.http_post('action', { _data: savedata, _do: 'edit' }, true);
+                }
+            });
+
+        rcmail.triggerEvent('kolab-notes-init');
     }
     this.init = init;
 
@@ -340,23 +325,17 @@ function rcube_kolab_notes_ui(settings)
             if (rcmail.gui_objects.noteseditform) {
                 rcmail.lock_form(rcmail.gui_objects.noteseditform, false);
             }
+            if (rcmail.is_framed()) {
+                parent.$(parent.kolab_note_dialog_element).dialog('destroy');
+            }
         });
 
-        var id;
-        for (id in me.notebooks) {
-            if (me.notebooks[id].editable) {
-                me.selected_list = id;
-                break;
+        var id, callback = function() {
+            if (settings.selected_uid) {
+                me.selected_list = settings.selected_list;
+                edit_note(settings.selected_uid);
             }
-        }
-
-        init_editor();
-        if (settings.selected_uid) {
-            me.selected_list = settings.selected_list;
-            edit_note(settings.selected_uid);
-        }
-        else {
-            setTimeout(function(){
+            else {
                 me.selected_note = $.extend({
                     list: me.selected_list,
                     uid: null,
@@ -367,59 +346,35 @@ function rcube_kolab_notes_ui(settings)
                     changed: rcmail.gettext('now', 'kolab_notes')
                 }, rcmail.env.kolab_notes_template || {});
                 render_note(me.selected_note);
-            }, 100);
+            }
+        };
+
+        for (id in me.notebooks) {
+            if (me.notebooks[id].editable) {
+                me.selected_list = id;
+                break;
+            }
         }
+
+        init_editor(callback);
     }
     this.init_dialog = init_dialog;
 
     /**
-     * initialize tinyMCE editor
+     * Initialize TinyMCE editor
      */
-    function init_editor()
+    function init_editor(callback)
     {
-        var editor_conf = {
-            selector: '#notecontent',
-            theme: 'modern',
-            language: settings.editor.lang,
-            content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css?v2'),
-            plugins: 'autolink charmap code link paste tabfocus searchreplace table textcolor',
-            toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify '
-                + '| bullist numlist outdent indent blockquote | forecolor backcolor fontselect fontsizeselect '
-                + '| link unlink table charmap | code searchreplace undo redo',
-            menubar: false,
-            statusbar: false,
-            toolbar_items_size: 'small',
-            extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
-            relative_urls: false,
-            remove_script_host: false,
-            convert_urls: false,
-            image_description: false,
-            paste_webkit_style: "color font-size font-family",
-            paste_data_images: true,
-            //spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',
-            //spellchecker_language: rcmail.env.spell_lang,
-            accessibility_focus: false,
-            tabfocus_elements: [':prev','btn-save-note'],
-            setup: function(ed) {
-                // make links open on shift-click
-                ed.on('click', function(e) {
-                    var link = $(e.target).closest('a');
-                    if (link.length && e.shiftKey) {
-                        if (!bw.mz) window.open(link.get(0).href, '_blank');
-                        return false;
-                    }
-                });
-            }
-        };
+        if (callback) {
+            rcmail.addEventListener('editor-load', callback);
+        }
 
-        // support external configuration settings e.g. from skin
-        if (window.rcmail_editor_settings)
-            $.extend(editor_conf, window.rcmail_editor_settings);
-
-        tinyMCE.init(editor_conf);
+        // initialize HTML editor
+        var config = $.extend(rcmail.env.editor_config, {disabled_plugins: ['image', 'media']});
+        rcmail.editor_init(config, 'notecontent');
 
         // register click handler for message links
-        $(rcmail.gui_objects.notesattachmentslist).on('click', 'li a.messagelink', function(){
+        $(rcmail.gui_objects.notesattachmentslist).on('click', 'li a.messagelink', function() {
             rcmail.open_window(this.href);
             return false;
         });
@@ -433,14 +388,6 @@ function rcube_kolab_notes_ui(settings)
         return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
     }
 
-    /**
-     * Trim whitespace off the given string
-     */
-    function trim(str)
-    {
-        return String(str).replace(/\s+$/, '').replace(/^\s+/, '');
-    }
-
     /**
      * Check permissions on the given list object
      */
@@ -482,7 +429,6 @@ function rcube_kolab_notes_ui(settings)
                 changed: rcmail.gettext('now', 'kolab_notes')
             }
             render_note(me.selected_note);
-            rcmail.enable_command('print', true);
         }
         else {
             ui_loading = rcmail.set_busy(true, 'loading');
@@ -495,85 +441,47 @@ function rcube_kolab_notes_ui(settings)
      */
     function list_edit_dialog(id)
     {
-        if (!rcmail.gui_containers.notebookeditform) {
-            return false;
-        }
+        var list = me.notebooks[id] || { name:'', editable:true, rights: 'riwta' },
+            title = rcmail.gettext((list.id ? 'editlist' : 'newnotebook'), 'kolab_notes'),
+            params = {_do: (list.id ? 'form-edit' : 'form-new'), _list: {id: list.id}, _framed: 1},
+            $dialog = $('<iframe>').attr('src', rcmail.url('list', params)).on('load', function() {
+                $(this).contents().find('#noteslist-name')
+                    .prop('disabled', !has_permission(list, 'a'))
+                    .val(list.editname || list.name)
+                    .select();
+            }),
+            save_func = function() {
+                var data,
+                    form = $dialog.contents().find('#noteslistpropform'),
+                    name = form.find('#noteslist-name');
 
-        // close show dialog first
-        var $dialog = rcmail.gui_containers.notebookeditform;
-        if ($dialog.is(':ui-dialog')) {
-            $dialog.dialog('close');
-        }
+                // form is not loaded
+                if (!form || !form.length)
+                    return false;
 
-        var list = me.notebooks[id] || { name:'', editable:true, rights: 'riwta' };
-        var form, name;
+                // do some input validation
+                if (!name.val() || name.val().length < 2) {
+                    rcmail.alert_dialog(rcmail.gettext('invalidlistproperties', 'kolab_notes'), function() {
+                        name.select();
+                    });
 
-        $dialog.html(rcmail.get_label('loading'));
-        $.ajax({
-            type: 'GET',
-            dataType: 'html',
-            url: rcmail.url('list'),
-            data: { _do: (list.id ? 'form-edit' : 'form-new'), _list: { id: list.id } },
-            success: function(data) {
-                $dialog.html(data);
-                rcmail.triggerEvent('kolab_notes_editform_load', list);
+                    return false;
+                }
 
-                // resize and reposition dialog window
-                form = $('#noteslistpropform');
-                var win = $(window), w = win.width(), h = win.height();
-                $dialog.dialog('option', { height: Math.min(h-20, form.height()+130), width: Math.min(w-20, form.width()+50) })
-                    .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
+                // post data to server
+                data = form.serializeJSON();
+                if (list.id)
+                    data.id = list.id;
 
-                name = $('#noteslist-name').prop('disabled', !has_permission(list, 'a')).val(list.editname || list.name);
-                name.select();
-            }
+                saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+                rcmail.http_post('list', { _do: (list.id ? 'edit' : 'new'), _list: data });
+                return true;
+            };
+
+        rcmail.simple_dialog($dialog, title, save_func, {
+            width: 600,
+            height: 400
         });
-
-        // dialog buttons
-        var buttons = {};
-        buttons[rcmail.gettext('save')] = function() {
-            // form is not loaded
-            if (!form || !form.length)
-              return;
-
-            // do some input validation
-            if (!name.val() || name.val().length < 2) {
-              alert(rcmail.gettext('invalidlistproperties', 'kolab_notes'));
-              name.select();
-              return;
-            }
-
-            // post data to server
-            var data = form.serializeJSON();
-            if (list.id)
-              data.id = list.id;
-
-            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('list', { _do: (list.id ? 'edit' : 'new'), _list: data });
-            $dialog.dialog('close');
-        };
-
-        buttons[rcmail.gettext('cancel')] = function() {
-            $dialog.dialog('close');
-        };
-
-        // open jquery UI dialog
-        $dialog.dialog({
-            modal: true,
-            resizable: true,
-            closeOnEscape: false,
-            title: rcmail.gettext((list.id ? 'editlist' : 'newnotebook'), 'kolab_notes'),
-            open: function() {
-                $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-            },
-            close: function() {
-                $dialog.html('').dialog('destroy').hide();
-            },
-            buttons: buttons,
-            minWidth: 480,
-            width: 640
-        }).show();
-
     }
 
     /**
@@ -618,9 +526,11 @@ function rcube_kolab_notes_ui(settings)
     function list_delete(id)
     {
         var list = me.notebooks[id];
-        if (list && confirm(rcmail.gettext('deletenotebookconfirm', 'kolab_notes'))) {
-            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('list', { _do: 'delete', _list: { id: list.id } });
+        if (list) {
+            rcmail.confirm_dialog(rcmail.gettext('kolab_notes.deletenotebookconfirm'), 'delete', function() {
+                saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+                rcmail.http_post('list', { _do: 'delete', _list: { id: list.id } });
+            });
         }
     }
 
@@ -746,24 +656,25 @@ function rcube_kolab_notes_ui(settings)
         reset_view();
         noteslist.clear(true);
         notesdata = {};
-        tagsfilter = [];
         update_state();
     }
 
-    function filter_notes()
+    /**
+     * Filter notes by tag
+     */
+    function filter_notes(tags)
     {
-        // tagsfilter
-        var note, tr, match;
-        for (var id in noteslist.rows) {
+        var id, note, tr, match;
+        for (id in noteslist.rows) {
             tr = noteslist.rows[id].obj;
             note = notesdata[id];
             match = note.tags && note.tags.length;
-            for (var i=0; match && note && i < tagsfilter.length; i++) {
-                if ($.inArray(tagsfilter[i], note.tags) < 0)
+            for (var i=0; match && note && i < tags.length; i++) {
+                if ($.inArray(tags[i], note.tags) < 0)
                     match = false;
             }
 
-            if (match || !tagsfilter.length) {
+            if (match || !tags.length) {
                 $(tr).show();
             }
             else {
@@ -775,9 +686,7 @@ function rcube_kolab_notes_ui(settings)
                     me.selected_note = null;
                     noteslist.clear_selection();
                 }, function(){
-                    tagsfilter = [];
-                    filter_notes();
-                    update_tagcloud();
+                    filter_notes(tags);
                 });
             }
         }
@@ -812,14 +721,12 @@ function rcube_kolab_notes_ui(settings)
             notesdata[rec.id] = rec;
         }
 
-        render_tagslist(data.tags || [], !data.search)
+        update_taglist();
         rcmail.set_busy(false, 'loading', ui_loading);
 
-        // select the single result
-        if (data.data.length == 1) {
-            noteslist.select(data.data[0].id);
-        }
-        else if (settings.selected_uid) {
+        rcmail.triggerEvent('listupdate', {list: noteslist, rowcount:noteslist.rowcount});
+
+        if (settings.selected_uid) {
             noteslist.select(rcmail.html_identifier_encode(settings.selected_uid));
             delete settings.selected_uid;
         }
@@ -827,7 +734,7 @@ function rcube_kolab_notes_ui(settings)
             noteslist.select(me.selected_note.id);
         }
         else if (!data.data.length) {
-            rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'info');
+            rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'notice');
         }
     }
 
@@ -847,47 +754,34 @@ function rcube_kolab_notes_ui(settings)
             container = rcmail.gui_containers['notedetailview'];
         }
 
+        // for Elastic
+        rcmail.triggerEvent('show-content', {
+            mode: data.uid ? 'edit' : 'add',
+            title: rcmail.gettext(data.uid ? 'editnote' : 'newnote', 'kolab_notes'),
+            obj: $('#notedetailsbox').parent(),
+            scrollElement: $('#notedetailsbox')
+        });
+
         var list = me.notebooks[data.list] || me.notebooks[me.selected_list] || { rights: 'lrs', editable: false };
             content = $('#notecontent').val(data.description),
             readonly = data.readonly || !(list.editable || !data.uid && has_permission(list,'i')),
             attachmentslist = gui_object('notesattachmentslist', container).html(''),
-            titlecontainer = container || rcmail.gui_objects.noteviewtitle;
+            titlecontainer = rcmail.gui_objects.noteviewtitle || container,
+            is_html = false;
+
+        // tag-edit line
+        if (window.kolab_tags_input) {
+            $('.tagline', titlecontainer).parent('.form-group').show();
+            taglist = kolab_tags_input($('.tagline', titlecontainer), data.tags, readonly);
+        }
 
         $('.notetitle', titlecontainer).val(data.title).prop('disabled', readonly).show();
-        $('.dates .notecreated', titlecontainer).html(Q(data.created || ''));
-        $('.dates .notechanged', titlecontainer).html(Q(data.changed || ''));
+        $('.dates .notecreated', titlecontainer).text(data.created || '');
+        $('.dates .notechanged', titlecontainer).text(data.changed || '');
         if (data.created || data.changed) {
             $('.dates', titlecontainer).show();
         }
 
-        // tag-edit line
-        var tagline = $('.tagline', titlecontainer).empty()[readonly?'addClass':'removeClass']('disabled').show();
-        $.each(typeof data.tags == 'object' && data.tags.length ? data.tags : [''], function(i,val) {
-            $('<input>')
-                .attr('name', 'tags[]')
-                .attr('tabindex', '0')
-                .addClass('tag')
-                .val(val)
-                .appendTo(tagline);
-        });
-
-        if (!data.tags || !data.tags.length) {
-            $('<span>').addClass('placeholder')
-              .html(rcmail.gettext('notags', 'kolab_notes'))
-              .appendTo(tagline)
-              .click(function(e) { $(this).parent().find('.tagedit-list').trigger('click'); });
-        }
-
-        $('.tagline input.tag', titlecontainer).tagedit({
-            animSpeed: 100,
-            allowEdit: false,
-            allowAdd: !readonly,
-            allowDelete: !readonly,
-            checkNewEntriesCaseSensitive: false,
-            autocompleteOptions: { source: tags, minLength: 0, noCheck: true },
-            texts: { removeLinkTitle: rcmail.gettext('removetag', 'kolab_notes') }
-        });
-
         if (data.links) {
             $.each(data.links, function(i, link) {
                 var li = $('<li>').addClass('link')
@@ -900,11 +794,12 @@ function rcube_kolab_notes_ui(settings)
                     .appendTo(attachmentslist);
 
                 if (!readonly && !data._from_mail) {
-                    $('<a>')
-                        .attr('href', '#delete')
-                        .attr('title', rcmail.gettext('removelink', 'kolab_notes'))
-                        .addClass('delete')
-                        .html(rcmail.gettext('delete'))
+                    $('<a>').attr({
+                            href: '#delete',
+                            title: rcmail.gettext('removelink', 'kolab_notes'),
+                            label: rcmail.gettext('delete'),
+                            'class': 'delete'
+                        })
                         .click({ uri:link.uri }, function(e) {
                             remove_link(this, e.data.uri);
                             return false;
@@ -914,11 +809,6 @@ function rcube_kolab_notes_ui(settings)
             });
         }
 
-        if (!readonly) {
-            $('.tagedit-list', titlecontainer)
-                .on('click', function(){ $('.tagline .placeholder').hide(); });
-        }
-
         if (!data.list)
             data.list = list.id;
 
@@ -938,35 +828,14 @@ function rcube_kolab_notes_ui(settings)
             html = text2html(html);
         }
 
-        var node, editor = tinyMCE.get('notecontent'), is_html = false;
-        retry = retry || 0;
-
-        // sometimes the editor instance is not ready yet (FF only)...
-        if (!readonly && !editor && $('#notecontent').length && retry < 5) {
-          // ... give it some more time
-          setTimeout(function() {
-              gui_object('noteseditform', container).show();
-              render_note(data, container, temp, retry+1);
-          }, 200);
-          return;
-        }
-
-        if (!readonly && editor) {
+        if (!readonly) {
             gui_object('notesdetailview', container).hide();
             gui_object('noteseditform', container).show();
-            editor.setContent(html);
-            node = editor.getContentAreaContainer().childNodes[0];
-            if (node) node.tabIndex = content.get(0).tabIndex;
 
-            if (me.selected_note.uid) {
-                if (!render_no_focus)
-                    editor.getBody().focus();
-            }
-            else
-                $('.notetitle', titlecontainer).focus().select();
+            rcmail.editor.set_content(html);
 
             // read possibly re-formatted content back from editor for later comparison
-            me.selected_note.description = editor.getContent({ format:'html' }).replace(/^\s*(<p><\/p>\n*)?/, '');
+            me.selected_note.description = rcmail.editor.get_content().replace(/^\s*(<p><\/p>\n*)?/, '');
             is_html = true;
         }
         else {
@@ -974,8 +843,6 @@ function rcube_kolab_notes_ui(settings)
             gui_object('notesdetailview', container).html(html).show();
         }
 
-        render_no_focus = false;
-
         // notify subscribers
         rcmail.triggerEvent('kolab_notes_render', { data:data, readonly:readonly, html:is_html });
         if (rcmail.is_framed())
@@ -983,6 +850,13 @@ function rcube_kolab_notes_ui(settings)
 
         // Trigger resize (needed for proper editor resizing)
         $(window).resize();
+
+        // Elastic
+        $(container).parents('.watermark').addClass('formcontainer');
+        $('#notedetailsbox').parent().trigger('loaded');
+
+        if (!readonly)
+            $('.notetitle', titlecontainer).focus().select();
     }
 
     /**
@@ -1032,7 +906,7 @@ function rcube_kolab_notes_ui(settings)
         $dialog = libkolab_audittrail.object_history_dialog({
             module: 'kolab_notes',
             container: '#notehistory',
-            title: rcmail.gettext('objectchangelog','kolab_notes') + ' - ' + rec.title,
+            title: rcmail.gettext('libkolab.objectchangelog') + ' - ' + rec.title,
 
             // callback function for list actions
             listfunc: function(action, rev) {
@@ -1065,10 +939,10 @@ function rcube_kolab_notes_ui(settings)
             rec = $dialog.data('rec');
 
         if (data === false || !data.length || !rec) {
-          // display 'unavailable' message
-          $('<div class="notfound-message note-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','kolab_notes') + '</div>')
-              .insertBefore($dialog.find('.changelog-table').hide());
-          return;
+            // display 'unavailable' message
+            $('<div class="notfound-message note-dialog-message warning">').text(rcmail.gettext('libkolab.objectchangelognotavailable'))
+                .insertBefore($dialog.find('.changelog-table').hide());
+            return;
         }
 
         data.module = 'kolab_notes';
@@ -1124,8 +998,9 @@ function rcube_kolab_notes_ui(settings)
      */
     function show_diff(data)
     {
-        var rec = me.selected_note,
-            $dialog = $('#notediff');
+        var change_old, change_new,
+            rec = me.selected_note,
+            $dialog = $('#notediff').clone();
 
         $dialog.find('div.form-section, h2.note-title-new').hide().data('set', false);
 
@@ -1153,52 +1028,37 @@ function rcube_kolab_notes_ui(settings)
                 row.children('.diff-text-old, .diff-text-new').hide();
             }
             else {
-                if (!html) {
-                    // escape HTML characters
-                    change.old_ = Q(change.old_ || change['old'] || '--')
-                    change.new_ = Q(change.new_ || change['new'] || '--')
-                }
-                row.children('.diff-text-old').html(change.old_ || change['old'] || '--').show();
-                row.children('.diff-text-new').html(change.new_ || change['new'] || '--').show();
+                change_old = change.old_ || change['old'] || '--';
+                change_new = change.new_ || change['new'] || '--';
+
+                row.children('.diff-text-old')[html ? 'html' : 'text'](change_old).show();
+                row.children('.diff-text-new')[html ? 'html' : 'text'](change_new).show();
             }
 
             row.show().data('set', true);
         });
 
         // open jquery UI dialog
-        $dialog.dialog({
-            modal: false,
-            resizable: true,
-            closeOnEscape: true,
-            title: rcmail.gettext('objectdiff','kolab_notes').replace('$rev1', data.rev1).replace('$rev2', data.rev2) + ' - ' + rec.title,
-            open: function() {
-                $dialog.attr('aria-hidden', 'false');
-            },
-            close: function() {
-                $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-            },
-            buttons: [
-                {
-                    text: rcmail.gettext('close'),
-                    click: function() { $dialog.dialog('close'); },
-                    autofocus: true
-                }
-            ],
-            minWidth: 400,
-            width: 480
-        }).show();
+        rcmail.simple_dialog($dialog,
+            rcmail.gettext('libkolab.objectdiff').replace('$rev1', data.rev1).replace('$rev2', data.rev2) + ' - ' + rec.title,
+            null, {
+                cancel_label: 'close',
+                minWidth: 400,
+                width: 480
+            }
+        );
 
         // set dialog size according to content
         libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height(), rcmail.gui_containers.notedetailview.width() - 40);
     }
 
-    // close the event history dialog
+    // close the note history dialog
     function close_history_dialog()
     {
         $('#notehistory, #notediff').each(function(i, elem) {
-        var $dialog = $(elem);
-        if ($dialog.is(':ui-dialog'))
-            $dialog.dialog('close');
+            var $dialog = $(elem);
+            if ($dialog.is(':ui-dialog'))
+                $dialog.dialog('close');
         });
     };
 
@@ -1220,28 +1080,11 @@ function rcube_kolab_notes_ui(settings)
      */
     function print_note()
     {
-        var printwin, data, list;
-        if (me.selected_note && (printwin = rcmail.open_window(settings.print_template))) {
-            list = me.notebooks[me.selected_note.list] || me.notebooks[me.selected_list] || {};
-            data = get_save_data();
+        var list = me.notebooks[me.selected_list],
+            uid = me.selected_note ? me.selected_note.uid : 0;
 
-            // for read-only notes, get_save_data() won't return the content
-            if (me.selected_note.readonly || !list.editable) {
-                data.description = me.selected_note.html || me.selected_note.description;
-                if (!me.selected_note.html || !data.description.match(/<(html|body)/)) {
-                    data.description = text2html(data.description);
-                }
-            }
-
-            $(printwin).load(function(){
-                printwin.document.title = data.title;
-                $('#notetitle', printwin.document).html(Q(data.title));
-                $('#notebody',  printwin.document).html(data.description);
-                $('#notetags',  printwin.document).html('<span class="tag">' + data.tags.join('</span><span class="tag">') + '</span>');
-                $('#notecreated', printwin.document).html(Q(me.selected_note.created));
-                $('#notechanged', printwin.document).html(Q(me.selected_note.changed));
-                printwin.print();
-            });
+        if (list && uid) {
+            rcmail.open_window(rcmail.url('print', {_uid: uid, _list: list.id}), true, true);
         }
     }
 
@@ -1251,12 +1094,12 @@ function rcube_kolab_notes_ui(settings)
     function send_note()
     {
         var uids = [];
-        for (var rec, i=0; i < noteslist.selection.length; i++) {
-            if (rec = notesdata[noteslist.selection[i]]) {
+        $.each(noteslist.selection, function() {
+            if (rec = notesdata[this]) {
                 uids.push(rec.uid);
                 // TODO: check if rec.uid == me.selected_note.uid and unsaved changes
             }
-        }
+        });
 
         if (uids.length) {
             rcmail.goto_url('mail/compose', { _with_notes: uids.join(','), _notes_list: me.selected_list }, true);
@@ -1264,88 +1107,26 @@ function rcube_kolab_notes_ui(settings)
     }
 
     /**
-     *
+     * Display the given counts to each tag
      */
-    function render_tagslist(newtags, replace)
+    function update_taglist(tags)
     {
-        if (replace) {
-            tags = newtags;
-        }
-        else {
-            var append = [];
-            for (var i=0; i < newtags.length; i++) {
-                if ($.inArray(newtags[i], tags) < 0)
-                    append.push(newtags[i]);
+        // compute counts first by iterating over all notes
+        var counts = {};
+        $.each(notesdata, function(id, rec) {
+            for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
+                t = rec.tags[j];
+                if (typeof counts[t] == 'undefined')
+                    counts[t] = 0;
+                counts[t]++;
             }
-            if (!append.length) {
-                update_tagcloud();
-                return;  // nothing to be added
-            }
-            tags = tags.concat(append);
-        }
-
-        // sort tags first
-        tags.sort(function(a,b){
-            return a.toLowerCase() > b.toLowerCase() ? 1 : -1;
-        })
-
-        var widget = $(rcmail.gui_objects.notestagslist).html('');
-
-        // append tags to tag cloud
-        $.each(tags, function(i, tag){
-            li = $('<li role="checkbox" aria-checked="false" tabindex="0"></li>')
-                .attr('rel', tag)
-                .data('value', tag)
-                .html(Q(tag) + '<span class="count"></span>')
-                .appendTo(widget)
-                .draggable({
-                    addClasses: false,
-                    revert: 'invalid',
-                    revertDuration: 300,
-                    helper: tag_draggable_helper,
-                    start: tag_draggable_start,
-                    appendTo: 'body',
-                    cursor: 'pointer'
-                });
         });
 
-        update_tagcloud();
-    }
+        rcmail.triggerEvent('kolab-tags-counts', {counter: counts});
 
-    /**
-     * Display the given counts to each tag and set those inactive which don't
-     * have any matching records in the current view.
-     */
-    function update_tagcloud(counts)
-    {
-        // compute counts first by iterating over all visible task items
-        if (typeof counts == 'undefined') {
-            counts = {};
-            $.each(notesdata, function(id, rec){
-                for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
-                    t = rec.tags[j];
-                    if (typeof counts[t] == 'undefined')
-                        counts[t] = 0;
-                    counts[t]++;
-                }
-            });
+        if (tags && tags.length) {
+            rcmail.triggerEvent('kolab-tags-refresh', {tags: tags});
         }
-
-        $(rcmail.gui_objects.notestagslist).children('li').each(function(i,li){
-            var elem = $(li), tag = elem.attr('rel'),
-                count = counts[tag] || 0;
-
-            elem.children('.count').html(count+'');
-            if (count == 0) elem.addClass('inactive');
-            else            elem.removeClass('inactive');
-
-            if (tagsfilter && tagsfilter.length && $.inArray(tag, tagsfilter)) {
-                elem.addClass('selected').attr('aria-checked', 'true');
-            }
-            else {
-                elem.removeClass('selected').attr('aria-checked', 'false');
-            }
-        });
     }
 
     /**
@@ -1360,10 +1141,10 @@ function rcube_kolab_notes_ui(settings)
 
         if (is_new || me.selected_note && data.id == me.selected_note.id) {
             render_note(data);
-            render_tagslist(data.tags || []);
+            update_taglist(data.tags || []);
         }
         else if (data.tags) {
-            render_tagslist(data.tags);
+            update_taglist(data.tags);
         }
 
         // add list item on top
@@ -1380,8 +1161,8 @@ function rcube_kolab_notes_ui(settings)
         }
         // update list item
         else if (row = noteslist.rows[data.id]) {
-            $('.title', row.obj).html(Q(data.title));
-            $('.date', row.obj).html(Q(data.changed || ''));
+            $('.title', row.obj).text(data.title);
+            $('.date', row.obj).text(data.changed || '');
             // TODO: move to top
         }
     }
@@ -1389,16 +1170,21 @@ function rcube_kolab_notes_ui(settings)
     /**
      * 
      */
-    function reset_view()
+    function reset_view(list)
     {
         close_history_dialog();
         me.selected_note = null;
         $('.notetitle', rcmail.gui_objects.noteviewtitle).val('').hide();
-        $('.tagline, .dates', rcmail.gui_objects.noteviewtitle).hide();
-        $(rcmail.gui_objects.noteseditform).hide();
+        $('.dates', rcmail.gui_objects.noteviewtitle).hide();
+        $('.tagline', rcmail.gui_objects.noteviewtitle).parent('.form-group').hide();
+        $(rcmail.gui_objects.noteseditform).hide().parents('.watermark').removeClass('formcontainer');
         $(rcmail.gui_objects.notesdetailview).hide();
         $(rcmail.gui_objects.notesattachmentslist).html('');
         rcmail.enable_command('save', false);
+
+        if (!list) {
+            rcmail.triggerEvent('show-list', {force: true});
+        }
     }
 
     /**
@@ -1424,18 +1210,20 @@ function rcube_kolab_notes_ui(settings)
 
         // do some input validation
         if (savedata.title == '') {
-            alert(rcmail.gettext('entertitle', 'kolab_notes'));
-            $('.notetitle', rcmail.gui_objects.noteviewtitle).focus();
+            rcmail.alert_dialog(rcmail.gettext('entertitle', 'kolab_notes'), function() {;
+                $('.notetitle', rcmail.gui_objects.noteviewtitle).focus();
+            });
+
             return false;
         }
 
         if (check_change_state(savedata)) {
             rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
             saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('action', { _data: savedata, _do: savedata.uid?'edit':'new' }, true);
+            rcmail.http_post('action', {_data: savedata, _do: savedata.uid ? 'edit' : 'new'}, true);
         }
         else {
-            rcmail.display_message(rcmail.get_label('nochanges', 'kolab_notes'), 'info');
+            rcmail.display_message(rcmail.get_label('nochanges', 'kolab_notes'), 'notice');
         }
     }
 
@@ -1444,32 +1232,20 @@ function rcube_kolab_notes_ui(settings)
      */
     function get_save_data()
     {
-        var editor = tinyMCE.get('notecontent'),
-            listselect = $('option:selected', rcmail.gui_objects.notebooks);
-        var savedata = {
-            title: trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
-            description: editor ? editor.getContent({ format:'html' }).replace(/^\s*(<p><\/p>\n*)?/, '') : $('#notecontent').val(),
-            list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
-            uid: me.selected_note.uid,
-            tags: []
-        };
+        var listselect = $('option:selected', rcmail.gui_objects.notebooks),
+            savedata = {
+                title: $.trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
+                description: rcmail.editor.get_content().replace(/^\s*(<p><\/p>\n*)?/, ''),
+                list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
+                uid: me.selected_note.uid,
+                tags: taglist ? kolab_tags_input_value(taglist) : []
+            };
 
         // copy links
         if ($.isArray(me.selected_note.links)) {
             savedata.links = me.selected_note.links;
         }
 
-        // collect tags
-        $('.tagedit-list input[type="hidden"]', rcmail.gui_objects.noteviewtitle).each(function(i, elem){
-            if (elem.value)
-                savedata.tags.push(elem.value);
-        });
-        // including the "pending" one in the text box
-        var newtag = $('#tagedit-input').val();
-        if (newtag != '') {
-            savedata.tags.push(newtag);
-        }
-
         return savedata;
     }
 
@@ -1504,17 +1280,9 @@ function rcube_kolab_notes_ui(settings)
         if (check_change_state()) {
             var dialog, buttons = [];
 
-            buttons.push({
-                text: rcmail.gettext('discard', 'kolab_notes'),
-                click: function() {
-                    dialog.dialog('close');
-                    ok();
-                }
-            });
-
             buttons.push({
                 text: rcmail.gettext('save'),
-                'class': 'mainaction',
+                'class': 'mainaction save',
                 click: function() {
                     save_note(beforesave);
                     dialog.dialog('close');
@@ -1523,8 +1291,18 @@ function rcube_kolab_notes_ui(settings)
                 }
             });
 
+            buttons.push({
+                text: rcmail.gettext('discard', 'kolab_notes'),
+                'class': 'discard',
+                click: function() {
+                    dialog.dialog('close');
+                    ok();
+                }
+            });
+
             buttons.push({
                 text: rcmail.gettext('abort', 'kolab_notes'),
+                'class': 'cancel',
                 click: function() {
                     dialog.dialog('close');
                     nok();
@@ -1574,9 +1352,9 @@ function rcube_kolab_notes_ui(settings)
             return false;
         }
 
-        if (confirm(rcmail.gettext('deletenotesconfirm','kolab_notes'))) {
-            var rec, id, uids = [];
-            for (var i=0; i < noteslist.selection.length; i++) {
+        rcmail.confirm_dialog(rcmail.gettext('kolab_notes.deletenotesconfirm'), 'delete', function() {
+            var i, rec, id, uids = [];
+            for (i=0; i < noteslist.selection.length; i++) {
                 id = noteslist.selection[i];
                 rec = notesdata[id];
                 if (rec) {
@@ -1590,9 +1368,9 @@ function rcube_kolab_notes_ui(settings)
             rcmail.http_post('action', { _data: { uid: uids.join(','), list: me.selected_list }, _do: 'delete' }, true);
 
             reset_view();
-            update_tagcloud();
+            update_taglist();
             noteslist.clear_selection();
-        }
+        });
     }
 
     /**
@@ -1632,81 +1410,6 @@ function rcube_kolab_notes_ui(settings)
             window.history.replaceState({}, document.title, rcmail.url('', query));
         }
     }
-
-
-    /*  Helper functions for drag & drop functionality of tags  */
-    
-    function tag_draggable_helper()
-    {
-        if (!tag_draghelper)
-            tag_draghelper = $('<div class="tag-draghelper"></div>');
-        else
-            tag_draghelper.html('');
-
-        $(this).clone().addClass('tag').appendTo(tag_draghelper);
-        return tag_draghelper;
-    }
-
-    function tag_draggable_start(event, ui)
-    {
-        // register notes list to receive drop events
-        $('li', rcmail.gui_objects.noteslist).droppable({
-            hoverClass: 'droptarget',
-            accept: tag_droppable_accept,
-            drop: tag_draggable_dropped,
-            addClasses: false
-        });
-
-        // allow to drop tags onto edit form title
-        $(rcmail.gui_objects.noteviewtitle).droppable({
-            drop: function(event, ui){
-                $('#tagedit-input').val(ui.draggable.data('value')).trigger('transformToTag');
-                $('.tagline .placeholder', rcmail.gui_objects.noteviewtitle).hide();
-            },
-            addClasses: false
-        })
-    }
-
-    function tag_droppable_accept(draggable)
-    {
-        if (rcmail.busy)
-            return false;
-
-        var tag = draggable.data('value'),
-            drop_id = $(this).attr('id').replace(/^rcmrow/, ''),
-            drop_rec = notesdata[drop_id];
-
-        // target already has this tag assigned
-        if (!drop_rec || (drop_rec.tags && $.inArray(tag, drop_rec.tags) >= 0)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    function tag_draggable_dropped(event, ui)
-    {
-        var drop_id = $(this).attr('id').replace(/^rcmrow/, ''),
-            tag = ui.draggable.data('value'),
-            rec = notesdata[drop_id],
-            savedata;
-
-        if (rec && rec.id) {
-            savedata = me.selected_note && rec.uid == me.selected_note.uid ? get_save_data() : $.extend({}, rec);
-
-            if (savedata.id)   delete savedata.id;
-            if (savedata.html) delete savedata.html;
-
-            if (!savedata.tags)
-                savedata.tags = [];
-            savedata.tags.push(tag);
-
-            rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
-            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('action', { _data: savedata, _do: 'edit' }, true);
-        }
-    }
-
 }
 
 
@@ -1731,13 +1434,56 @@ jQuery.fn.sortElements = (function(){
 })();
 
 
-/* notes plugin UI initialization */
+// List options menu for Elastic
+function kolab_notes_options_menu()
+{
+    var content = $('#options-menu'),
+        width = content.width() + 25,
+        dialog = content.clone(true);
+
+    // set form values
+    $('select[name="sort_col"]', dialog).val(kolabnotes.settings.sort_col || '');
+    $('select[name="sort_ord"]', dialog).val(kolabnotes.settings.sort_order || 'ASC');
+
+    // Fix id/for attributes
+    $('select', dialog).each(function() { this.id = this.id + '-clone'; });
+    $('label', dialog).each(function() { $(this).attr('for', $(this).attr('for') + '-clone'); });
+
+    var save_func = function(e) {
+        if (rcube_event.is_keyboard(e.originalEvent)) {
+            $('#listmenulink').focus();
+        }
+
+        var col = $('select[name="sort_col"]', dialog).val(),
+            ord = $('select[name="sort_ord"]', dialog).val();
+
+        kolabnotes.list_set_sort(col, ord);
+        return true;
+    };
+
+    dialog = rcmail.simple_dialog(dialog, rcmail.gettext('listoptionstitle'), save_func, {
+        closeOnEscape: true,
+        open: function(e) {
+            setTimeout(function() { dialog.find('select').first().focus(); }, 100);
+        },
+        minWidth: 400,
+        width: width
+    });
+};
+
+
+/* Notes plugin UI initialization */
 var kolabnotes;
 window.rcmail && rcmail.addEventListener('init', function(evt) {
+    if (rcmail.task == 'notes' && rcmail.env.action == 'print') {
+        rcmail.print_dialog();
+        return;
+    }
+
     kolabnotes = new rcube_kolab_notes_ui(rcmail.env.kolab_notes_settings);
+
     if (rcmail.env.action == 'dialog-ui')
         kolabnotes.init_dialog();
     else
         kolabnotes.init();
 });
-
diff --git a/plugins/kolab_notes/notes_mail.js b/plugins/kolab_notes/notes_mail.js
index ce5854a5..a3ad893f 100644
--- a/plugins/kolab_notes/notes_mail.js
+++ b/plugins/kolab_notes/notes_mail.js
@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014-2017, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -25,99 +25,73 @@
  * for the JavaScript code in this file.
  */
 
-
 window.rcmail && rcmail.addEventListener('init', function(evt) {
     /**
      * Open the notes edit GUI in a jquery UI dialog
      */
     function kolab_note_dialog(url)
     {
-        var frame, name, mywin = window, edit = url && url._id,
-            $dialog = $('#kolabnotesinlinegui');
-
-        function dialog_render(p)
-        {
-            $dialog.parent().find('.ui-dialog-buttonset .ui-button')
-                .prop('disabled', p.readonly)
-                .last().prop('disabled', false);
-        }
-
-        // create dialog if not exists
-        if (!$dialog.length) {
-            $dialog = $('<iframe>')
-                .attr('id', 'kolabnotesinlinegui')
-                .attr('name', 'kolabnotesdialog')
-                .attr('src', 'about:blank')
-                .css('min-width', '100%')
-                .on('load', function(e) {
-                    frame = rcmail.get_frame_window('kolabnotesinlinegui');
-                    name = $('.notetitle', frame.rcmail.gui_objects.noteviewtitle);
-                    frame.rcmail.addEventListener('responseafteraction', refresh_mailview);
-                });
-
-            // subscribe event in parent window which is also triggered from iframe
-            // (probably before the 'load' event from above)
-            rcmail.addEventListener('kolab_notes_render', dialog_render);
-        }
-        // close show dialog first
-        else if ($dialog.is(':ui-dialog')) {
-            $dialog.dialog('close');
-        }
-
         if (!url) url = {};
         url._framed = 1;
-        $dialog.attr('src', rcmail.url('notes/dialog-ui', url));
+
+        var $dialog, frame, buttons = {},
+            button_classes = ['mainaction save'],
+            edit = url._id,
+            title = edit ? rcmail.gettext('kolab_notes.editnote') : rcmail.gettext('kolab_notes.appendnote'),
+            dialog_render = function(p) {
+                $dialog.parent().find('.ui-dialog-buttonset .ui-button')
+                    .prop('disabled', p.readonly)
+                    .last().prop('disabled', false);
+            };
+
+        $dialog = $('<iframe>').attr({
+                id: 'kolabnotesinlinegui',
+                name: 'kolabnotesdialog',
+                src: rcmail.url('notes/dialog-ui', url)
+            }).on('load', function(e) {
+                frame = rcmail.get_frame_window('kolabnotesinlinegui');
+                frame.rcmail.addEventListener('responseafteraction', refresh_mailview);
+            });
+
+        // subscribe event in parent window which is also triggered from iframe
+        // (probably before the 'load' event from above)
+        rcmail.addEventListener('kolab_notes_render', dialog_render);
 
         // dialog buttons
-        var buttons = {};
         buttons[rcmail.gettext('save')] = function() {
             // frame is not loaded
             if (!frame)
                 return;
 
-            // do some input validation
-            if (!name.val() || name.val().length < 2) {
-                alert(rcmail.gettext('entertitle', 'kolab_notes'));
-                name.select();
-                return;
-            }
-
             frame.rcmail.command('save');
         };
 
         if (edit) {
+            button_classes.push('delete');
             buttons[rcmail.gettext('delete')] = function() {
                 if (confirm(rcmail.gettext('deletenotesconfirm','kolab_notes'))) {
                     rcmail.addEventListener('responseafteraction', refresh_mailview);
                     rcmail.http_post('notes/action', { _data: { uid: url._id, list: url._list }, _do: 'delete' }, true);
-                    $dialog.dialog('close');
+                    $dialog.dialog('destroy');
                 }
             };
         }
 
+        button_classes.push('cancel');
         buttons[rcmail.gettext(edit ? 'close' : 'cancel')] = function() {
-            $dialog.dialog('close');
+            $dialog.dialog('destroy');
         };
 
         // open jquery UI dialog
-        var win = $(window);
-        $dialog.dialog({
-            modal: true,
-            resizable: true,
-            closeOnEscape: true,
-            title: edit ? rcmail.gettext('editnote','kolab_notes') : rcmail.gettext('appendnote','kolab_notes'),
-            open: function() {
-                $dialog.parent().find('.ui-dialog-buttonset .ui-button').prop('disabled', true).first().addClass('mainaction');
-            },
+        window.kolab_note_dialog_element = $dialog = rcmail.show_popup_dialog($dialog, title, buttons, {
+            button_classes: button_classes,
             close: function() {
-                $dialog.dialog('destroy');
                 rcmail.removeEventListener('kolab_notes_render', dialog_render);
             },
-            buttons: buttons,
-            minWidth: 480,
-            width: 680,
-            height: Math.min(640, win.height() - 100)
-        }).show();
+            minWidth: 500,
+            width: 600,
+            height: 500
+        });
     }
 
     /**
@@ -125,19 +99,19 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
      */
     function refresh_mailview(e)
     {
-        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : mywin;
+        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : window;
         if (win && e.response) {
             win.location.reload();
             if (e.response.action == 'action')
-                $('#kolabnotesinlinegui').dialog('close');
+                $('#kolabnotesinlinegui').dialog('destroy');
         }
     }
 
     // register commands
     rcmail.register_command('edit-kolab-note', kolab_note_dialog, true);
     rcmail.register_command('append-kolab-note', function() {
-        var uid;
-        if ((uid = rcmail.get_single_uid())) {
+        var uid = rcmail.get_single_uid();
+        if (uid) {
             kolab_note_dialog({ _msg: uid + '-' + rcmail.env.mailbox });
         }
     });
diff --git a/plugins/kolab_notes/skins/elastic/templates/dialogview.html b/plugins/kolab_notes/skins/elastic/templates/dialogview.html
new file mode 100644
index 00000000..7eb00f29
--- /dev/null
+++ b/plugins/kolab_notes/skins/elastic/templates/dialogview.html
@@ -0,0 +1,29 @@
+<roundcube:include file="includes/layout.html" />
+
+<div id="notedetailsbox" class="formcontent">
+	<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
+	<div class="notebookselect row form-group" style="display:none">
+		<label for="kolab-notebook" class="col-sm-2 col-form-label"><roundcube:label name="kolab_notes.savein" /></label>
+		<div class="col-sm-10">
+			<roundcube:object name="plugin.notebooks" id="kolab-notebook" type="select" class="form-control" />
+		</div>
+	</div>
+	<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
+	<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
+	<div id="notereferences">
+		<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+	</div>
+</div>
+
+<script type="text/javascript">
+
+// UI startup
+$(document).ready(function(e) {
+    rcmail.addEventListener('kolab_notes_render', function(p) {
+        $('#notesdialogheader .notebookselect')[p.readonly ? 'hide' : 'show']();
+    });
+});
+
+</script>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
new file mode 100644
index 00000000..0d194053
--- /dev/null
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -0,0 +1,151 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
+
+<!-- notebooks list -->
+<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
+	<div class="header">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span id="aria-label-notebooks" class="header-title"><roundcube:label name="kolab_notes.lists" /></span>
+		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
+			title="kolab_notes.listactions" class="button icon sidebar-menu" data-popup="notebookactions-menu"
+			innerClass="inner" label="actions" />
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar toolbar"
+		ariatag="h2" label="foldersearchform" label-domain="kolab_notes" buttontitle="findnotebooks" />
+	<div id="notebooks-content" class="scroller">
+		<roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist iconized" />
+	</div>
+</div>
+
+<!-- notes list -->
+<div class="list listbox selected" aria-labelledby="aria-label-noteslist">
+	<div class="header">
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="kolab_notes.notebooks" /></span></a>
+		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
+		<div id="listcontrols" class="toolbar" role="toolbar">
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
+				label="options" innerClass="inner" onclick="return kolab_notes_options_menu()" />
+		</div>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+		label="notesearchform" label-domain="kolab_notes" buttontitle="kolab_notes.findnotes" ariatag="h2" />
+	<div class="scroller">
+		<h2 id="aria-label-noteslist" class="voice"><roundcube:label name="kolab_notes.notes" /></h2>
+		<roundcube:object name="plugin.listing" id="kolabnoteslist"
+			class="listing" summary="kolab_notes.arialabelnoteslist"
+			role="listbox" data-list="noteslist"
+			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="createnote" />
+	</div>
+</div>
+
+<!-- note details frame -->
+<div class="content" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div id="notestoolbar" class="toolbar">
+			<roundcube:button command="createnote" type="link"
+				class="button create disabled" classAct="button create"
+				label="create" title="kolab_notes.createnote" innerclass="inner" data-fab="true" />
+			<roundcube:button command="print" type="link" data-hidden="small"
+				class="button print disabled" classAct="button print"
+				label="print" title="print" innerClass="inner" />
+			<roundcube:button command="delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				title="delete" label="delete" innerClass="inner" />
+			<span class="spacer"></span>
+			<roundcube:button command="sendnote" type="link"
+				class="button send disabled" classAct="button send"
+				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
+			<roundcube:container name="toolbar" id="notestoolbar" />
+			<roundcube:if condition="config:kolab_bonnie_api" />
+				<roundcube:button command="history" type="link"
+					class="button history note-history disabled" classAct="button history note-history"
+					label="libkolab.objectchangelog" title="libkolab.showhistory" innerClass="inner" />
+			<roundcube:endif />
+		</div>
+	</div>
+	<!-- note content frame -->
+	<h2 id="aria-label-noteform" class="voice"><roundcube:label name="kolab_notes.arialabelnoteform" /></h2>
+	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-noteform">
+		<div id="notedetailsbox" class="formcontent">
+			<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
+			<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
+			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
+			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
+			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
+				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+			</div>
+			<roundcube:container name="notedetailview" id="notedetailsbox" />
+		</div>
+		<div class="formbuttons">
+			<roundcube:button command="save" class="btn btn-primary submit" label="save" id="btn-save-note" />
+		</div>
+	</div>
+</div>
+
+<!-- popups and dialogs -->
+<roundcube:if condition="config:kolab_bonnie_api" />
+<div id="notehistory" class="popupmenu" aria-hidden="true">
+	<roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
+	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="notediff" class="popupmenu" aria-hidden="true">
+	<h2 class="note-title">Note Title</h2>
+	<h2 class="note-title-new diff-text-new"></h2>
+	<div class="form-section note-tags">
+		<span class="diff-text-old"></span> &#8674; <span class="diff-text-new"></span>
+	</div>
+	<div class="form-section note-description">
+		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+	<div class="form-section notereferences">
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+</div>
+<roundcube:endif />
+
+<div id="notebookactions-menu" class="popupmenu">
+	<h3 id="aria-label-actionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
+		<roundcube:button type="link-menuitem" command="list-create" label="kolab_notes.addnotebook" class="create disabled" classAct="create active" />
+		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:button type="link-menuitem" command="list-remove" label="kolab_notes.removelist" class="remove disabled" classAct="remove active" />
+		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
+	</ul>
+</div>
+
+<div id="options-menu" class="popupmenu propform" role="menu" aria-labelledby="aria-label-optionsmenu">
+	<h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotessortmenu" /></h3>
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select id="listoptions-sortcol" name="sort_col" class="form-control">
+				<option value="changed"><roundcube:label name="kolab_notes.changed" /></option>
+				<option value="title"><roundcube:label name="kolab_notes.title" /></option>
+			</select>
+		</div>
+	</div>
+	<div class="form-group row">
+		<label for="listoptions-sortord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select id="listoptions-sortord" name="sort_ord" class="form-control" disabled>
+				<option value="ASC"><roundcube:label name="asc" /></option>
+				<option value="DESC"><roundcube:label name="desc" /></option>
+			</select>
+		</div>
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_notes/skins/elastic/templates/print.html b/plugins/kolab_notes/skins/elastic/templates/print.html
new file mode 100644
index 00000000..fddf9c35
--- /dev/null
+++ b/plugins/kolab_notes/skins/elastic/templates/print.html
@@ -0,0 +1,8 @@
+<roundcube:include file="includes/layout.html" />
+
+<div class="print-content" role="main">
+	<div id="notedetailstitle"><roundcube:object name="noteheader" /></div>
+	<div id="notebody"><roundcube:object name="notebody" /></div>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_notes/skins/larry/notes.css b/plugins/kolab_notes/skins/larry/notes.css
index 2c18762a..37e34909 100644
--- a/plugins/kolab_notes/skins/larry/notes.css
+++ b/plugins/kolab_notes/skins/larry/notes.css
@@ -68,17 +68,9 @@
 	left: 252px;
 }
 
-.notesview #tagsbox {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 240px;
-}
-
 .notesview #notebooksbox {
 	position: absolute;
-	top: 252px;
+	top: 0;
 	left: 0;
 	width: 100%;
 	bottom: 0px;
@@ -106,6 +98,7 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	outline: none;
+	border: 0;
 }
 
 .notesview #kolabnoteslist .date {
@@ -271,11 +264,6 @@
 	border-bottom: 0;
 }
 
-.notesview .ui-dialog-content .tagline {
-	display: none !important;
-}
-
-.notesview .notetitle .disabled .tagedit-list,
 .notesview .notetitle input.inline-edit:disabled {
 	outline: none;
 	padding-left: 0;
@@ -305,7 +293,6 @@
 }
 
 .notesview .notetitle .dates,
-.notesview .notetitle .tagline,
 .notesdialog .notebookselect label {
 	color: #999;
 	font-weight: normal;
@@ -317,53 +304,20 @@
 	margin-top: 4px;
 }
 
-.notesview .notetitle .tagline {
-	position: relative;
-	cursor: text;
-	margin: 4px 0 0 0;
+.notetitle .col-form-label {
+	display: none;
 }
 
-.notesview .notetitle .tagline.disabled {
-	margin-top: 0;
+.notetitle .dates div.row {
+	display: inline;
 }
 
-.notesview .notetitle .tagline .placeholder {
-	position: absolute;
-	top: 6px;
-	left: 6px;
-	z-index: 2;
+.notetitle .dates .col-form-label {
+	display: inline;
 }
 
-.notesview .notetitle .tagline.disabled .placeholder {
-	left: 0;
-}
-
-.notesview .notetitle .tagedit-list {
-	position: relative;
-	z-index: 1;
-	min-height: 32px;
-/*	padding: 2px; */
-	-webkit-box-sizing: border-box;
-	   -moz-box-sizing: border-box;
-	    -ms-box-sizing: border-box;
-	        box-sizing: border-box;
-}
-
-/* Firefox 3.6 */
-_:not(), _:-moz-handler-blocked, .notesview .notetitle .tagedit-list {
-	min-height: 26px;
-}
-
-.notesview .notetitle .disabled .tagedit-list {
-	min-height: 26px;
-}
-
-.notesview .notetitle #tagedit-input {
-	background: none;
-}
-
-.notesview .tag-draghelper {
-	z-index: 1000;
+.notebookselect {
+	clear: both;
 }
 
 .notesview .notetitle .notecreated,
diff --git a/plugins/kolab_notes/skins/larry/templates/dialogview.html b/plugins/kolab_notes/skins/larry/templates/dialogview.html
index b42af928..31a5f11f 100644
--- a/plugins/kolab_notes/skins/larry/templates/dialogview.html
+++ b/plugins/kolab_notes/skins/larry/templates/dialogview.html
@@ -27,8 +27,6 @@
 var UI = new rcube_mail_ui();
 
 $(document).ready(function(e){
-    UI.init();
-
     function layout_view()
     {
         var form = $('#noteform, #notedetails'),
@@ -50,7 +48,7 @@ $(document).ready(function(e){
 
         // fixes issue when toolbar is not ready yet and content
         // area height is set to 0, wait and try again later...
-        if (h < 0)
+        if (h < 40)
             setTimeout(function() { layout_view(); }, 100);
     }
 
diff --git a/plugins/kolab_notes/skins/larry/templates/notes.html b/plugins/kolab_notes/skins/larry/templates/notes.html
index 0270b45c..58e026f0 100644
--- a/plugins/kolab_notes/skins/larry/templates/notes.html
+++ b/plugins/kolab_notes/skins/larry/templates/notes.html
@@ -24,19 +24,12 @@
         <label for="quicksearchbox" class="voice"><roundcube:label name="kolab_notes.arialabelnotesquicksearchbox" /></label>
         <a id="searchmenulink" class="iconbutton searchoptions" > </a>
         <roundcube:object name="plugin.searchform" id="quicksearchbox" />
-        <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+        <roundcube:button type="link" command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
     </div>
 
     <div id="mainscreencontent">
 
     <div id="sidebar">
-        <div id="tagsbox" class="uibox listbox">
-            <h2 class="boxtitle" id="aria-label-tagsbox"><roundcube:label name="kolab_notes.tags" id="taglist" /></h2>
-            <div class="scroller">
-                <roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" role="region" aria-labelledby="aria-label-tagsbox" aria-controls="kolabnoteslist" />
-            </div>
-        </div>
-
         <div id="notebooksbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-notebooks">
             <h2 class="boxtitle" id="aria-label-notebooks"><roundcube:label name="kolab_notes.lists" />
                 <a href="#notebooks" class="iconbutton search" title="<roundcube:label name='kolab_notes.findnotebooks' />" tabindex="0"><roundcube:label name="kolab_notes.findnotebooks" /></a>
@@ -47,7 +40,7 @@
                     <label for="notebooksearch" class="voice"><roundcube:label name="kolab_notes.searchterms" /></label>
                     <input type="text" name="q" id="notebooksearch" placeholder="<roundcube:label name='kolab_notes.findnotebooks' />" />
                     <a class="iconbutton searchicon"></a>
-                    <roundcube:button command="reset-listsearch" id="notebooksearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+                    <roundcube:button type="link" command="reset-listsearch" id="notebooksearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
                 </div>
             </div>
             <div class="scroller withfooter">
@@ -61,10 +54,10 @@
         <div id="notesoptionsmenu" class="popupmenu" aria-hidden="true">
             <h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
             <ul class="toolbarmenu" id="notesoptionsmenu-menu" role="menu" aria-labelledby="aria-label-optionsmenu">
-                <li role="menuitem"><roundcube:button command="list-edit" label="edit" classAct="active" /></li>
-                <li role="menuitem"><roundcube:button command="list-delete" label="delete" classAct="active" /></li>
-                <li role="menuitem"><roundcube:button command="list-remove" label="kolab_notes.removelist" classAct="active" /></li>
-                <li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="list-edit" label="edit" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="list-delete" label="delete" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="list-remove" label="kolab_notes.removelist" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
             </ul>
         </div>
     </div>
@@ -97,7 +90,7 @@
                 <roundcube:button command="save" type="input" class="button mainaction" label="save" id="btn-save-note" />
                 <div class="footerright">
                 <roundcube:if condition="config:kolab_bonnie_api" />
-                    <roundcube:button command="history" type="link" label="kolab_notes.showhistory" class="btn-note-history" classAct="btn-note-history active" />
+                    <roundcube:button command="history" type="link" label="libkolab.showhistory" class="btn-note-history" classAct="btn-note-history active" />
                 <roundcube:endif />
                 </div>
             </div>
@@ -146,20 +139,12 @@
     </ul>
 </div>
 
-<div id="notebookeditform" class="uidialog" aria-labelledby="aria-label-editform" aria-hidden="true" role="dialog">
-    <h3 id="aria-label-editform" class="voice"><roundcube:label name="kolab_notes.arialabelnotebookform" /></h3>
-    <roundcube:container name="notebookeditform" id="notebookeditform" />
-    <roundcube:label name="loading" />
-</div>
-
 <script type="text/javascript">
 
 // UI startup
 var UI = new rcube_mail_ui();
 
 $(document).ready(function(e){
-    UI.init();
-
     rcmail.addEventListener('kolab_notes_editform_load', function(e){
         UI.init_tabs($('#notebookeditform > form').addClass('propform tabbed'));
     })
@@ -168,8 +153,6 @@ $(document).ready(function(e){
         orientation:'v', relative:true, start:240, min:180, size:12, render:layout_view }).init();
     new rcube_splitter({ id:'noteslistsplitter2', p1:'#noteslistbox', p2:'#notedetailsbox',
         orientation:'v', relative:true, start:242, min:180, size:12, render:layout_view }).init();
-    new rcube_splitter({ id:'notesviewsplitterv', p1:'#tagsbox', p2:'#notebooksbox',
-        orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
 
     function layout_view()
     {
@@ -225,7 +208,6 @@ $(document).ready(function(e){
 
         return false;
     });
-    
 });
 
 </script>
diff --git a/plugins/kolab_notes/skins/larry/templates/print.html b/plugins/kolab_notes/skins/larry/templates/print.html
index 42d9101f..a5f272b7 100644
--- a/plugins/kolab_notes/skins/larry/templates/print.html
+++ b/plugins/kolab_notes/skins/larry/templates/print.html
@@ -1,24 +1,15 @@
 <roundcube:object name="doctype" value="html5" />
 <html>
 <head>
-<title>Print</title>
-<link rel="stylesheet" type="text/css" href="/this/print.css" />
+  <title><roundcube:object name="pagetitle" /></title>
+  <link rel="stylesheet" type="text/css" href="/this/print.css" />
 </head>
 <body class="notesprint">
-
-<div id="notedetailstitle">
-    <h1 id="notetitle">#Title</h1>
-    <div id="notetags" class="tagline">#Tags</div>
-    <div class="dates">
-        <label><roundcube:label name="kolab_notes.created" /></label>
-        <span id="notecreated">#Created</span>
-        <label><roundcube:label name="kolab_notes.changed" /></label>
-        <span id="notechanged">#Changed</span>
-    </div>
-</div>
-
-<div id="notebody">
-#Body
-</div>
+  <div id="notedetailstitle">
+    <roundcube:object name="noteheader" />
+  </div>
+  <div id="notebody">
+    <roundcube:object name="notebody" />
+  </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/kolab_shortcuts/composer.json b/plugins/kolab_shortcuts/composer.json
index 339e52ae..1a2bc58b 100644
--- a/plugins/kolab_shortcuts/composer.json
+++ b/plugins/kolab_shortcuts/composer.json
@@ -4,7 +4,7 @@
     "description": "Keyboard shortcuts compatible with Kontact",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.6",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
diff --git a/plugins/owncloud/LICENSE b/plugins/kolab_sso/LICENSE
similarity index 100%
rename from plugins/owncloud/LICENSE
rename to plugins/kolab_sso/LICENSE
diff --git a/plugins/kolab_sso/README b/plugins/kolab_sso/README
new file mode 100644
index 00000000..bad65b82
--- /dev/null
+++ b/plugins/kolab_sso/README
@@ -0,0 +1,79 @@
+Single Sign On Authentication for Kolab
+---------------------------------------
+
+This plugin adds possibility to authenticate users via external authentication
+services. Currently the only supported method of authentication is OpenID Connect.
+
+Because Kolab backends do not support token authentication it is required
+to use master user (sasl proxy) authentication where possible and service
+user credentials in other places. See IMPLEMENTATION NOTES below for details.
+
+Plugin requires libkolab plugin and HTTP/Request2 library.
+Plugin contains BSD-licensed https://github.com/firebase/php-jwt (v5.0.0) library.
+
+Supported algorithms:
+- HS256, HS385, HS512 (PHP hash extension required)
+- RS256, RS384, RS512 (PHP openssl extension required).
+
+
+INSTALLATION
+------------
+
+Enable plugin in Roundcube's main configuration file. Make sure it is first
+on the list of plugins, especially before any authentication plugin, e.g. kolab_auth.
+
+Default return-URL for Auth Provider is https://host.roundcube?_task=login&_action=sso,
+but not all providers support query params. To workaround this limitation you have to
+define an alias URI or redirect. For example:
+
+RewriteEngine On
+RewriteCond %{REQUEST_URI}  ^/roundcubemail
+RewriteRule "^sso" "/roundcubemail/?_task=login&_action=sso" [L,QSA]
+
+For the above "alias" plugin configuration should include 'response_uri' = '/sso'
+and on the provider side configured URI will be https://host/roundcubemail/sso.
+
+
+IMPLEMENTATION NOTES
+--------------------
+
+Specification: https://openid.net/specs/openid-connect-core-1_0.html
+
+Limitations:
+- OpenIDC Discovery and Dynamic Client Registration is not supported,
+- Authentication with Authorization Code Flow is the only one supported,
+- required grant types: authorization_code, refresh_token (for token refresh),
+- required claims: id_token,
+- required scopes: email, openid, offline_access (for token refresh),
+- endpoints used: token, authorization,
+- supported signature algorithms: HS256, HS385, HS512, RS256, RS384, RS512.
+- supported token endpoint auth methods: client_secret_basic, client_secret_post.
+
+[IMAP] Because Kolab backend do not support token authentication it is required
+to use master user (sasl proxy) authentication, i.e. you have to put
+master user credentials in plugin's config.
+
+[SMTP] For the same reason and also because the same master user does not work in Postfix,
+you have to specify SMTP connection parameters/user+password.
+
+[LDAP] Global addressbook (read-only) requires LDAP user/password. 'user_specific' option does
+not work as well as proxy authentication.
+
+[Freebusy] Authentication into kolab-freebusy service is not yet implemented. A solution for
+now is to add Roundcube host(s) into trustednetworks.allow option in kolab-freebusy service config.
+
+[Chwala] Authentication to Chwala will work if it uses the same (session) database as Roundcube.
+Additionally set $config['fileapi_plugins'] = array('kolab_sso', 'kolab_auth', 'kolab_folders');
+Authenticating to Seafile/WebDAV storage is not supported (until it's custom user-defined
+storage).
+
+
+TODO
+----
+
+- kolab_delegation (LDAP auth for write operation)
+- Chwala+Seafile
+- Chwala+WebDAV
+- Freebusy auth
+- Mattermost auth
+- Extended token validation
diff --git a/plugins/kolab_sso/composer.json b/plugins/kolab_sso/composer.json
new file mode 100644
index 00000000..d3e52052
--- /dev/null
+++ b/plugins/kolab_sso/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "kolab/kolab_sso",
+    "type": "roundcube-plugin",
+    "description": "Single Sign On for Kolab",
+    "homepage": "https://git.kolab.org/diffusion/RPK/",
+    "license": "AGPLv3",
+    "version": "3.4.1",
+    "authors": [
+        {
+            "name": "Aleksander Machniak",
+            "email": "machniak@kolabsys.com",
+            "role": "Lead"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3",
+        "kolab/libkolab": ">=3.4.0",
+        "pear/http_request2": "~2.3.0"
+    }
+}
diff --git a/plugins/kolab_sso/config.inc.php.dist b/plugins/kolab_sso/config.inc.php.dist
new file mode 100644
index 00000000..0b0c61d9
--- /dev/null
+++ b/plugins/kolab_sso/config.inc.php.dist
@@ -0,0 +1,60 @@
+<?php
+
+// Enable debugging
+$config['kolab_sso_debug'] = true;
+
+// IMAP (master) user
+$config['kolab_sso_imap_user'] = 'cyrus-admin';
+
+// IMAP (master) password
+$config['kolab_sso_imap_pass'] = 'password';
+
+// SMTP server host
+// To override the SMTP port or connection method, provide a full URL like 'tls://somehost:587'
+$config['kolab_sso_smtp_server'] = null;
+
+// SMTP username
+$config['kolab_sso_smtp_user'] = '';
+
+// SMTP password
+$config['kolab_sso_smtp_pass'] = '';
+
+// LDAP user DN
+$config['kolab_sso_ldap_user'] = 'uid=kolab-service,ou=Special Users,dc=example,dc=org';
+
+// LDAP password
+$config['kolab_sso_ldap_pass'] = 'password';
+
+// Require SSO logon by removing possibility to logon with user/password
+$config['kolab_sso_disable_login'] = false;
+
+// SSO providers/configuration
+$config['kolab_sso_options'] = array();
+/* Example:
+$config['kolab_sso_options'] = array(
+    'keycloak' => array(
+        // User-friendly name (will be displayed in the button label)
+        'name'   => 'OpenIDC Test',
+        // Driver name
+        'driver' => 'openidc',
+        // Provider API URI
+        'uri' => 'https://kolab.eu.auth0.com',
+        // Client ID/Secret for the API
+        'client_id' => '20w6DXX69isNBaufCwyK24wkBHqPT2ht',
+        'client_secret' => 'd78McGW4UWfFyZprGd8BCKooll',
+        // Token URI, if different than <uri>/token
+        'token_uri' => 'https://kolab.eu.auth0.com/oauth/token',
+        // Authorize URI, if different than <uri>/authorize
+        'auth_uri' => 'https://kolab.eu.auth0.com/authorize',
+        // Response URI, by default we use https://domain.tld/path?_task=login&_action=sso
+        // Define it if the Provider does not allow above
+        // to use https://domain.tld/path/<response_uri> instead
+        'response_uri' => '/sso',
+        // Public key (or certificate) for token validation when using RS256/RS385/RS512 method
+        'pubkey' => '-----BEGIN CERTIFICATE-----
+            ...
+            -----END CERTIFICATE-----
+        ',
+    ),
+);
+*/
diff --git a/plugins/kolab_sso/drivers/openidc.php b/plugins/kolab_sso/drivers/openidc.php
new file mode 100644
index 00000000..c12d27da
--- /dev/null
+++ b/plugins/kolab_sso/drivers/openidc.php
@@ -0,0 +1,413 @@
+<?php
+
+/**
+ * kolab_sso driver implementing OpenIDC Authorization Code Flow
+ * https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowSteps
+ *
+ * TODO: Discovery: https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfigurationRequest
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class kolab_sso_openidc
+{
+    protected $id     = 'openidc';
+    protected $config = array();
+    protected $plugin;
+
+
+    public function __construct($plugin, $config)
+    {
+        $this->plugin = $plugin;
+        $this->config = $config;
+
+        $this->plugin->require_plugin('libkolab');
+    }
+
+    /**
+     * Authentication request (redirect to SSO service)
+     */
+    public function authorize()
+    {
+        $params = array(
+            'response_type' => 'code',
+            'scope'         => 'openid email offline_access',
+            'client_id'     => $this->config['client_id'],
+            'state'         => $this->plugin->rc->get_request_token(),
+            'redirect_uri'  => $this->redirect_uri(),
+        );
+
+        // TODO: Other params by config: display, prompt, max_age,
+
+        $url = $this->config['auth_uri'] ?: (unslashify($this->config['uri']) . '/authorize');
+        $url .= '?' . http_build_query($params);
+
+        $this->plugin->debug("[{$this->id}][authorize] Redirecting to $url");
+
+        header("Location: $url");
+        die;
+    }
+
+    /**
+     * Authorization response validation
+     */
+    public function response()
+    {
+        $this->plugin->debug("[{$this->id}][authorize] Response: " . $_SERVER['REQUEST_URI']);
+
+        $this->error = $this->error_message(
+            rcube_utils::get_input_value('error', rcube_utils::INPUT_GET),
+            rcube_utils::get_input_value('error_description', rcube_utils::INPUT_GET),
+            rcube_utils::get_input_value('error_uri', rcube_utils::INPUT_GET)
+        );
+
+        if ($this->error) {
+            return;
+        }
+
+        $state = rcube_utils::get_input_value('state', rcube_utils::INPUT_GET);
+        $code  = rcube_utils::get_input_value('code', rcube_utils::INPUT_GET);
+
+        if (!$state) {
+            $this->plugin->debug("[{$this->id}][response] State missing");
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            return;
+        }
+
+        if ($state != $this->plugin->rc->get_request_token()) {
+            $this->plugin->debug("[{$this->id}][response] Invalid response state");
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            return;
+        }
+
+        if (!$code) {
+            $this->plugin->debug("[{$this->id}][response] Code missing");
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            return;
+        }
+
+        return $this->request_token($code);
+    }
+
+    /**
+     * Error message for the response handler
+     */
+    public function response_error()
+    {
+        if ($this->error) {
+            return $this->plugin->rc->gettext('loginfailed') . ' ' . $this->error;
+        }
+    }
+
+    /**
+     * Existing session validation
+     */
+    public function validate_session($session)
+    {
+        $this->plugin->debug("[{$this->id}][validate] Session: " . json_encode($session));
+
+        // Sanity checks
+        if (empty($session) || empty($session['code']) || empty($session['validto']) || empty($session['email'])) {
+            $this->plugin->debug("[{$this->id}][validate] Session invalid");
+            return;
+        }
+
+        // Check expiration time
+        $now     = new DateTime('now', new DateTimezone('UTC'));
+        $validto = new DateTime($session['validto'], new DateTimezone('UTC'));
+
+        // Don't refresh often than TTL/2
+        $validto->sub(new DateInterval(sprintf('PT%dS', $session['ttl']/2)));
+        if ($now < $validto) {
+            $this->plugin->debug("[{$this->id}][validate] Token valid, skipping refresh");
+            return $session;
+        }
+
+        // No refresh_token, not possible to refresh
+        if (empty($session['refresh_token'])) {
+            $this->plugin->debug("[{$this->id}][validate] Session cannot be refreshed");
+            return;
+        }
+
+        // Renew tokens
+        $info = $this->request_token($session['code'], $session['refresh_token']);
+
+        if (!empty($info)) {
+            // Make sure the email didn't change
+            if (!empty($info['email']) && $info['email'] != $session['email']) {
+                $this->plugin->debug("[{$this->id}][validate] Email address change");
+                return;
+            }
+
+            $session = array_merge($session, $info);
+
+            $this->plugin->debug("[{$this->id}][validate] Session valid: " . json_encode($session));
+            return $session;
+        }
+    }
+
+    /**
+     * Authentication Token request (or token refresh)
+     */
+    protected function request_token($code, $refresh_token = null)
+    {
+        $mode   = $refresh_token ? 'token-refresh' : 'token';
+        $url    = $this->config['token_uri'] ?: ($this->config['uri'] . '/token');
+        $params = array(
+            'client_id'     => $this->config['client_id'],
+            'client_secret' => $this->config['client_secret'],
+            'grant_type'    => $refresh_token ? 'refresh_token' : 'authorization_code',
+        );
+
+        if ($refresh_token) {
+            $params['refresh_token'] = $refresh_token;
+            $params['scope']         = 'openid email offline_access';
+        }
+        else {
+            $params['code']         = $code;
+            $params['redirect_uri'] = $this->redirect_uri();
+        }
+
+        $post = http_build_query($params);
+
+        $this->plugin->debug("[{$this->id}][$mode] Requesting POST $url?$post");
+
+        try {
+            // TODO: JWT-based methods of client authentication
+            // https://openid.net/specs/openid-connect-core-1_0.html#rfc.section.9
+
+            $request = $this->get_request($url, 'POST');
+            $request->setAuth($this->config['client_id'], $this->config['client_secret']);
+            $request->setBody($post);
+
+            $response = $request->send();
+            $status   = $response->getStatus();
+            $response = $response->getBody();
+
+            $this->plugin->debug("[{$this->id}][$mode] Response: $response");
+
+            $response = @json_decode($response, true);
+
+            if ($status != 200 || !is_array($response) || !empty($response['error'])) {
+                $err = $this->error_text(is_array($response) ? $response['error'] : null);
+                throw new Exception("OpenIDC request failed with error: $err");
+            }
+        }
+        catch (Exception $e) {
+            $this->error = $this->plugin->gettext('errorunknown');
+            rcube::raise_error(array(
+                'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
+                true, false);
+            return;
+        }
+
+        // Example response: {
+        //   "access_token":"ACCESS_TOKEN",
+        //   "token_type":"bearer",
+        //   "expires_in":2592000,
+        //   "refresh_token":"REFRESH_TOKEN",
+        //   "scope":"read",
+        //   "uid":100101,
+        //   "info":{"name":"Mark E. Mark","email":"mark@example.com"}
+        // }
+
+        if (empty($response['access_token']) || empty($response['token_type'])
+            || strtolower($response['token_type']) != 'bearer'
+        ) {
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            $this->plugin->debug("[{$this->id}][$mode] Error: Invalid or unsupported response");
+            return;
+        }
+
+        $ttl     = $response['expires_in'] ?: 600;
+        $validto = new DateTime(sprintf('+%d seconds', $ttl), new DateTimezone('UTC'));
+
+        $result = array(
+            'code'          => $code,
+            'access_token'  => $response['access_token'],
+            // 'token_type'    => $response['token_type'],
+            'validto'       => $validto->format(DateTime::ISO8601),
+            'ttl'           => $ttl,
+        );
+
+        if (!empty($response['refresh_token'])) {
+            $result['refresh_token'] = $response['refresh_token'];
+        }
+
+        if (!empty($response['id_token'])) {
+            try {
+                $key = $this->config['client_secret'];
+
+                if (!empty($this->config['pubkey'])) {
+                    $pubkey = trim(preg_replace('/\r?\n[\s\t]+/', "\n", $this->config['pubkey']));
+
+                    if (strpos($pubkey, '-----') !== 0) {
+                        $pubkey = "-----BEGIN PUBLIC KEY-----\n" . trim(chunk_split($pubkey, 64, "\n")) . "\n-----END PUBLIC KEY-----";
+                    }
+
+                    if ($keyid = openssl_pkey_get_public($pubkey)) {
+                        $key = $keyid;
+                    }
+                    else {
+                        throw new Exception("Failed to extract public key");
+                    }
+                }
+
+                $jwt = new Firebase\JWT\JWT;
+                $jwt::$leeway = 60;
+
+                $payload = $jwt->decode($response['id_token'], $key, array_keys(Firebase\JWT\JWT::$supported_algs));
+                $email   = $this->config['debug_email'] ?: $payload->email;
+
+                if (empty($email)) {
+                    throw new Exception("No email address in JWT token");
+                }
+
+                if (!in_array($this->config['client_id'], (array) $payload->aud)) {
+                    throw new Exception("Token audience does not match");
+                }
+
+                // More extended token validation
+                // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
+
+                $result['email'] = $email;
+            }
+            catch (Exception $e) {
+                $this->error = $this->plugin->gettext('errorinvalidtoken');
+                rcube::raise_error(array(
+                    'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
+                    true, false);
+                return;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * The URL to use when redirecting the user from SSO back to Roundcube
+     */
+    protected function redirect_uri()
+    {
+        // response_uri is useful when the Provider does not allow
+        // URIs with parameters. In such case set response_uri = '/sso'
+        // and define a redirect in http server, example for Apache:
+        // RewriteRule "^sso" "/roundcubemail/?_task=login&_action=sso" [L,QSA]
+
+        $redirect_params = empty($this->config['response_uri']) ? array('_action' => 'sso') : array();
+
+        $url = $this->plugin->rc->url($redirect_params, false, true);
+
+        if (!empty($this->config['response_uri'])) {
+            $url = unslashify(preg_replace('/\?.*$/', '', $url)) . '/' . ltrim($this->config['response_uri'], '/');
+        }
+
+        return $url;
+    }
+
+    /**
+     * Get HTTP/Request2 object
+     */
+    protected function get_request($url, $type)
+    {
+        $config = array_intersect_key($this->config, array_flip(array(
+                'ssl_verify_peer',
+                'ssl_verify_host',
+                'ssl_cafile',
+                'ssl_capath',
+                'ssl_local_cert',
+                'ssl_passphrase',
+                'follow_redirects',
+        )));
+
+        return libkolab::http_request($url, $type, $config);
+    }
+
+    /**
+     * Returns (localized) user-friendly error message
+     */
+    protected function error_message($error, $description, $uri)
+    {
+        if (empty($error)) {
+            return;
+        }
+
+        $msg = $this->error_text($error);
+
+        rcube::raise_error(array(
+            'message' => "[SSO] $msg." . ($description ? " $description" : '') . ($uri ? " ($uri)" : '')
+            ), true, false);
+
+        $label = 'error' . str_replace('_', '', $error);
+        if (!$this->plugin->rc->text_exists($label, 'kolab_sso')) {
+            $label = 'errorunknown';
+        }
+
+        return $this->plugin->gettext($label);
+    }
+
+    /**
+     * Returns error text for specified OpenIDC error code
+     */
+    protected function error_text($error)
+    {
+        switch ($error) {
+        // OAuth2 codes
+        case 'invalid_request':
+            return "Request malformed";
+        case 'unauthorized_client':
+            return "The client is not authorized";
+        case 'invalid_client':
+            return "Client authentication failed";
+        case 'access_denied':
+            return "Request denied";
+        case 'unsupported_response_type':
+            return "Unsupported response type";
+        case 'invalid_grant':
+            return "Invalid authorization grant";
+        case 'unsupported_grant_type':
+            return "Unsupported authorization grant";
+        case 'invalid_scope':
+            return "Invalid scope";
+        case 'server_error':
+            return "Server error";
+        case 'temporarily_unavailable':
+            return "Service temporarily unavailable";
+        // OpenIDC codes
+        case 'interaction_required':
+            return "End-User interaction required";
+        case 'login_required':
+            return "End-User authentication required";
+        case 'account_selection_required':
+            return "End-User account selection required";
+        case 'consent_required':
+            return "End-User consent required";
+        case 'invalid_request_uri':
+            return "Invalid request_uri";
+        case 'invalid_request_object':
+            return "Invalid Request Object";
+        case 'request_not_supported':
+            return "Request not supported";
+        case 'request_uri_not_supported':
+            return "request_uri param not supported";
+        case 'registration_not_supported':
+            return "Registration not supported";
+        }
+
+        return "Unknown error";
+    }
+}
diff --git a/plugins/kolab_sso/kolab_sso.php b/plugins/kolab_sso/kolab_sso.php
new file mode 100644
index 00000000..ef8c278c
--- /dev/null
+++ b/plugins/kolab_sso/kolab_sso.php
@@ -0,0 +1,406 @@
+<?php
+
+/**
+ * Single Sign On Authentication for Kolab
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class kolab_sso extends rcube_plugin
+{
+    public $rc;
+
+    private $data;
+    private $old_data;
+    private $driver;
+    private $logon_error;
+    private $debug = false;
+
+
+    /**
+     * Plugin initialization
+     */
+    public function init()
+    {
+        // Roundcube or Chwala
+        if (defined('RCMAIL_VERSION') || defined('FILE_API_START')) {
+            $this->rc = rcube::get_instance();
+
+            $this->add_hook('startup', array($this, 'startup'));
+            $this->add_hook('authenticate', array($this, 'authenticate'));
+
+            $this->rc->add_shutdown_function(array($this, 'shutdown'));
+        }
+    }
+
+    /**
+     * Startup hook handler
+     */
+    public function startup($args)
+    {
+        // On login or logout (or when the session expired)...
+        if ($args['task'] == 'login' || $args['task'] == 'logout') {
+            $mode = $args['action'] == 'sso' ? $_SESSION['sso_mode'] : rcube_utils::get_input_value('_sso', rcube_utils::INPUT_GP);
+
+            // Authorization
+            if ($mode) {
+                $driver = $this->get_driver($mode);
+
+                // This is where we handle redirections from the SSO provider
+                if ($args['action'] == 'sso') {
+                    $this->data = $driver->response();
+
+                    if (!empty($this->data)) {
+                        $this->data['timezone'] = $_SESSION['sso_timezone'];
+                        $this->data['url']      = $_SESSION['sso_url'];
+                        $this->data['mode']     = $mode;
+                    }
+                    else {
+                        $this->logon_error = $driver->response_error();
+                    }
+                }
+                // This is where we handle clicking one of "Login by SSO" buttons
+                else if ($_SESSION['temp'] && $this->rc->check_request()) {
+                    // Remember some logon params for use on SSO response above
+                    $_SESSION['sso_timezone'] = rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_POST);
+                    $_SESSION['sso_url']      = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
+                    $_SESSION['sso_mode']     = $mode;
+
+                    $driver->authorize();
+                }
+
+                $args['action'] = 'login';
+                $args['task']   = 'login';
+            }
+        }
+        // On valid session...
+        else if (isset($_SESSION['user_id'])
+            && ($data = $_SESSION['sso_data'])
+            && ($data = json_decode($this->rc->decrypt($data), true))
+            && ($mode = $data['mode'])
+        ) {
+            $driver = $this->get_driver($mode);
+
+            $this->old_data = $data;
+
+            // Session validation, token refresh, etc.
+            if ($this->data = $driver->validate_session($data)) {
+                // register storage connection hooks
+                $this->authenticate(array(), true);
+            }
+            else {
+                // Destroy the session
+                $this->rc->kill_session();
+                // TODO: error message beter explaining the reason
+                // $this->rc->output->show_message('sessionferror', 'error');
+            }
+        }
+
+        // Register login form modifications
+        $this->add_hook('template_object_loginform', array($this, 'login_form'));
+
+        return $args;
+    }
+
+    /**
+     * Authenticate hook handler
+     */
+    public function authenticate($args, $internal = false)
+    {
+        // Chwala
+        if (defined('FILE_API_START') && !$internal && empty($args['pass']) && strpos($args['user'], 'RC:') === 0) {
+            // extract session ID and username from the token
+            list(, $sess_id, $user) = explode(':', $args['user']);
+
+            // unset user, set invalid state
+            $args['valid'] = false;
+            $args['user']  = null;
+
+            $session = rcube_session::factory($this->rc->config);
+
+            if ($data = $session->read($sess_id)) {
+                // get SSO data from the existing session
+                $old_session = $_SESSION;
+                session_decode($data);
+                $session_user = $_SESSION['username'];
+                $data         = $_SESSION['sso_data'];
+                $_SESSION     = $old_session;
+
+                // TODO: allow only configured REMOTE_ADDR?
+                if ($session_user == $user && $data && ($data = json_decode($this->rc->decrypt($data), true)) && ($mode = $data['mode'])) {
+                    $driver = $this->get_driver($mode);
+
+                    // Session validation, token refresh, etc.
+                    if ($this->data = $driver->validate_session($data)) {
+                        $args['user']  = $user;
+                        $args['pass']  = 'fake-sso-password';
+                        $args['valid'] = true;
+                        $this->authenticate(array(), true);
+                    }
+                }
+            }
+        }
+        // Roundcube
+        else if (!empty($this->data) && ($email = $this->data['email'])) {
+            if (!$internal) {
+                $args['user']        = $email;
+                $args['pass']        = 'fake-sso-password';
+                $args['valid']       = true;
+                $args['cookiecheck'] = false;
+
+                $_POST['_timezone'] = $this->data['timezone'];
+                $_POST['_url']      = $this->data['url'];
+            }
+
+            $this->add_hook('storage_connect', array($this, 'storage_connect'));
+            $this->add_hook('managesieve_connect', array($this, 'storage_connect'));
+            $this->add_hook('smtp_connect', array($this, 'smtp_connect'));
+            $this->add_hook('ldap_connected', array($this, 'ldap_connected'));
+            $this->add_hook('chwala_authenticate', array($this, 'chwala_authenticate'));
+        }
+        else if ($this->logon_error) {
+            $args['valid'] = false;
+            $args['error'] = $this->logon_error;
+        }
+
+        return $args;
+    }
+
+    /**
+     * Shutdown handler
+     */
+    public function shutdown()
+    {
+        // Between startup and authenticate the session is destroyed.
+        // So, we save the data later than that.
+        if (!empty($this->data) && !empty($_SESSION['user_id'])
+            // update session only when data changed
+            && (empty($this->old_data) || $this->old_data != $this->data)
+        ) {
+            $_SESSION['sso_data'] = $this->rc->encrypt(json_encode($this->data));
+        }
+    }
+
+    /**
+     * Storage_connect/managesieve_connect hook handler
+     */
+    public function storage_connect($args)
+    {
+        $user = $this->rc->config->get('kolab_sso_imap_user');
+        $pass = $this->rc->config->get('kolab_sso_imap_pass');
+
+        if ($user && $pass) {
+            $args['auth_cid']  = $user;
+            $args['auth_pw']   = $pass;
+            $args['auth_type'] = 'PLAIN';
+        }
+
+        return $args;
+    }
+
+    /**
+     * Smtp_connect hook handler
+     */
+    public function smtp_connect($args)
+    {
+        foreach (array('smtp_server', 'smtp_user', 'smtp_pass') as $prop) {
+            $args[$prop] = $this->rc->config->get("kolab_sso_$prop", $args[$prop]);
+        }
+
+        return $args;
+    }
+
+    /**
+     * ldap_connected hook handler
+     */
+    public function ldap_connected($args)
+    {
+        $user = $this->rc->config->get('kolab_sso_ldap_user');
+        $pass = $this->rc->config->get('kolab_sso_ldap_pass');
+
+        if ($user && $pass && $args['user_specific']) {
+            $args['bind_dn']       = $user;
+            $args['bind_pass']     = $pass;
+            $args['search_filter'] = null;
+        }
+
+        return $args;
+    }
+
+    /**
+     * Chwala_authenticate hook handler
+     */
+    public function chwala_authenticate($args)
+    {
+        // Instead of normal basic auth with  user/pass we'll use
+        // Authorization: Bearer <roundcube session id>
+        $bearer = 'RC:' . session_id() . ':' . $_SESSION['username'];
+
+        $args['request']->setAuth(null);
+        $args['request']->setHeader('Authorization', 'Bearer ' . base64_encode($bearer));
+
+        return $args;
+    }
+
+    /**
+     * Login form object
+     */
+    public function login_form($args)
+    {
+        $this->load_config();
+
+        $options       = (array) $this->rc->config->get('kolab_sso_options');
+        $disable_login = $this->rc->config->get('kolab_sso_disable_login');
+
+        if (empty($options)) {
+            return $args;
+        }
+
+        $doc = new DOMDocumentHelper('1.0');
+        $doc->loadHTML($args['content']);
+
+        $body = $doc->getElementsByTagName('body')->item(0);
+
+        if ($disable_login) {
+            // Remove login form inputs table
+            $table = $doc->getElementsByTagName('table')->item(0);
+            $table->parentNode->removeChild($table);
+
+            // Remove original Submit button
+            $submit = $doc->getElementsByTagName('button')->item(0);
+            $submit->parentNode->removeChild($submit);
+        }
+
+        if (!$this->driver) {
+            $this->add_texts('localization/');
+        }
+
+        // Add SSO form elements
+        $form = $doc->createNode('p', null, array('id' => 'sso-form', 'class' => 'formbuttons'), $body);
+
+        foreach ($options as $idx => $option) {
+            $label = array('name' => 'loginby', 'vars' => array('provider' => $option['name'] ?: $this->gettext('sso')));
+            $doc->createNode('button', $this->gettext($label), array(
+                    'type'    => 'button',
+                    'value'   => $idx,
+                    'class'   => 'button sso w-100 mb-1',
+                    'onclick' => 'kolab_sso_submit(this)',
+                ), $form);
+        }
+
+        $doc->createNode('input', null, array('name' => '_sso', 'type' => 'hidden'), $form);
+
+        // Save the form content back and append script
+        $args['content'] = $doc->saveHTML($body)
+            . "<script>"
+            . "function kolab_sso_submit(button) {"
+                . "\$('[name=_sso]').val(button.value);"
+                . "\$('input[type=text],input[type=password]').attr('required', false);"
+                . "rcmail.gui_objects.loginform.submit();"
+            . "}"
+            . "</script>";
+
+        return $args;
+    }
+
+    /**
+     * Debug function for drivers
+     */
+    public function debug($line)
+    {
+        if ($this->debug) {
+            rcube::write_log('sso', $line);
+        }
+    }
+
+    /**
+     * Initialize SSO driver object
+     */
+    private function get_driver($name)
+    {
+        if ($this->driver) {
+            return $this->driver;
+        }
+
+        $this->load_config();
+        $this->add_texts('localization/');
+
+        $options = (array) $this->rc->config->get('kolab_sso_options');
+        $options = (array) $options[$name];
+        $driver  = $options['driver'] ?: 'openidc';
+        $class   = "kolab_sso_$driver";
+
+        if (empty($options) || !file_exists($this->home . "/drivers/$driver.php")) {
+            rcube::raise_error(array(
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Unable to find SSO driver"
+                ), true, true);
+        }
+
+        // Add /lib to include_path
+        $include_path = $this->home . '/lib' . PATH_SEPARATOR;
+        $include_path .= ini_get('include_path');
+        set_include_path($include_path);
+
+        require_once $this->home . "/drivers/$driver.php";
+
+        $this->debug  = $this->rc->config->get('kolab_sso_debug');
+        $this->driver = new $class($this, $options);
+
+        return $this->driver;
+    }
+}
+
+/**
+ * DOMDocument wrapper with some shortcut method
+ */
+class DOMDocumentHelper extends DOMDocument
+{
+    public function loadHTML($html, $options = 0)
+    {
+        return parent::loadHTML('<html><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"></head><body>' . $html);
+    }
+
+    public function saveHTML($node = null)
+    {
+        return preg_replace('|</?body>|', '', parent::saveHTML($node));
+    }
+
+    public function createNode($name, $value = null, $args = array(), $parent = null, $prepend = false)
+    {
+        $node = parent::createElement($name);
+
+        if ($value) {
+            $node->appendChild(new DOMText(rcube::Q($value)));
+        }
+
+        foreach ($args as $attr_name => $attr_value) {
+            $node->setAttribute($attr_name, $attr_value);
+        }
+
+        if ($parent) {
+            if ($prepend && $parent->firstChild) {
+                $parent->insertBefore($node, $parent->firstChild);
+            }
+            else {
+                $parent->appendChild($node);
+            }
+        }
+
+        return $node;
+    }
+}
diff --git a/plugins/kolab_sso/lib/Firebase/JWT/BeforeValidException.php b/plugins/kolab_sso/lib/Firebase/JWT/BeforeValidException.php
new file mode 100644
index 00000000..a6ee2f7c
--- /dev/null
+++ b/plugins/kolab_sso/lib/Firebase/JWT/BeforeValidException.php
@@ -0,0 +1,7 @@
+<?php
+namespace Firebase\JWT;
+
+class BeforeValidException extends \UnexpectedValueException
+{
+
+}
diff --git a/plugins/kolab_sso/lib/Firebase/JWT/ExpiredException.php b/plugins/kolab_sso/lib/Firebase/JWT/ExpiredException.php
new file mode 100644
index 00000000..3597370a
--- /dev/null
+++ b/plugins/kolab_sso/lib/Firebase/JWT/ExpiredException.php
@@ -0,0 +1,7 @@
+<?php
+namespace Firebase\JWT;
+
+class ExpiredException extends \UnexpectedValueException
+{
+
+}
diff --git a/plugins/kolab_sso/lib/Firebase/JWT/JWT.php b/plugins/kolab_sso/lib/Firebase/JWT/JWT.php
new file mode 100644
index 00000000..22a67e32
--- /dev/null
+++ b/plugins/kolab_sso/lib/Firebase/JWT/JWT.php
@@ -0,0 +1,379 @@
+<?php
+
+namespace Firebase\JWT;
+use \DomainException;
+use \InvalidArgumentException;
+use \UnexpectedValueException;
+use \DateTime;
+
+/**
+ * JSON Web Token implementation, based on this spec:
+ * https://tools.ietf.org/html/rfc7519
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Neuman Vong <neuman@twilio.com>
+ * @author   Anant Narayanan <anant@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ */
+class JWT
+{
+
+    /**
+     * When checking nbf, iat or expiration times,
+     * we want to provide some extra leeway time to
+     * account for clock skew.
+     */
+    public static $leeway = 0;
+
+    /**
+     * Allow the current timestamp to be specified.
+     * Useful for fixing a value within unit testing.
+     *
+     * Will default to PHP time() value if null.
+     */
+    public static $timestamp = null;
+
+    public static $supported_algs = array(
+        'HS256' => array('hash_hmac', 'SHA256'),
+        'HS512' => array('hash_hmac', 'SHA512'),
+        'HS384' => array('hash_hmac', 'SHA384'),
+        'RS256' => array('openssl', 'SHA256'),
+        'RS384' => array('openssl', 'SHA384'),
+        'RS512' => array('openssl', 'SHA512'),
+    );
+
+    /**
+     * Decodes a JWT string into a PHP object.
+     *
+     * @param string        $jwt            The JWT
+     * @param string|array  $key            The key, or map of keys.
+     *                                      If the algorithm used is asymmetric, this is the public key
+     * @param array         $allowed_algs   List of supported verification algorithms
+     *                                      Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+     *
+     * @return object The JWT's payload as a PHP object
+     *
+     * @throws UnexpectedValueException     Provided JWT was invalid
+     * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
+     * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
+     * @throws BeforeValidException         Provided JWT is trying to be used before it's been created as defined by 'iat'
+     * @throws ExpiredException             Provided JWT has since expired, as defined by the 'exp' claim
+     *
+     * @uses jsonDecode
+     * @uses urlsafeB64Decode
+     */
+    public static function decode($jwt, $key, array $allowed_algs = array())
+    {
+        $timestamp = is_null(static::$timestamp) ? time() : static::$timestamp;
+
+        if (empty($key)) {
+            throw new InvalidArgumentException('Key may not be empty');
+        }
+        $tks = explode('.', $jwt);
+        if (count($tks) != 3) {
+            throw new UnexpectedValueException('Wrong number of segments');
+        }
+        list($headb64, $bodyb64, $cryptob64) = $tks;
+        if (null === ($header = static::jsonDecode(static::urlsafeB64Decode($headb64)))) {
+            throw new UnexpectedValueException('Invalid header encoding');
+        }
+        if (null === $payload = static::jsonDecode(static::urlsafeB64Decode($bodyb64))) {
+            throw new UnexpectedValueException('Invalid claims encoding');
+        }
+        if (false === ($sig = static::urlsafeB64Decode($cryptob64))) {
+            throw new UnexpectedValueException('Invalid signature encoding');
+        }
+        if (empty($header->alg)) {
+            throw new UnexpectedValueException('Empty algorithm');
+        }
+        if (empty(static::$supported_algs[$header->alg])) {
+            throw new UnexpectedValueException('Algorithm not supported');
+        }
+        if (!in_array($header->alg, $allowed_algs)) {
+            throw new UnexpectedValueException('Algorithm not allowed');
+        }
+        if (is_array($key) || $key instanceof \ArrayAccess) {
+            if (isset($header->kid)) {
+                if (!isset($key[$header->kid])) {
+                    throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
+                }
+                $key = $key[$header->kid];
+            } else {
+                throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
+            }
+        }
+
+        // Check the signature
+        if (!static::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
+            throw new SignatureInvalidException('Signature verification failed');
+        }
+
+        // Check if the nbf if it is defined. This is the time that the
+        // token can actually be used. If it's not yet that time, abort.
+        if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
+            throw new BeforeValidException(
+                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->nbf)
+            );
+        }
+
+        // Check that this token has been created before 'now'. This prevents
+        // using tokens that have been created for later use (and haven't
+        // correctly used the nbf claim).
+        if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
+            throw new BeforeValidException(
+                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->iat)
+            );
+        }
+
+        // Check if this token has expired.
+        if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
+            throw new ExpiredException('Expired token');
+        }
+
+        return $payload;
+    }
+
+    /**
+     * Converts and signs a PHP object or array into a JWT string.
+     *
+     * @param object|array  $payload    PHP object or array
+     * @param string        $key        The secret key.
+     *                                  If the algorithm used is asymmetric, this is the private key
+     * @param string        $alg        The signing algorithm.
+     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+     * @param mixed         $keyId
+     * @param array         $head       An array with header elements to attach
+     *
+     * @return string A signed JWT
+     *
+     * @uses jsonEncode
+     * @uses urlsafeB64Encode
+     */
+    public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $head = null)
+    {
+        $header = array('typ' => 'JWT', 'alg' => $alg);
+        if ($keyId !== null) {
+            $header['kid'] = $keyId;
+        }
+        if ( isset($head) && is_array($head) ) {
+            $header = array_merge($head, $header);
+        }
+        $segments = array();
+        $segments[] = static::urlsafeB64Encode(static::jsonEncode($header));
+        $segments[] = static::urlsafeB64Encode(static::jsonEncode($payload));
+        $signing_input = implode('.', $segments);
+
+        $signature = static::sign($signing_input, $key, $alg);
+        $segments[] = static::urlsafeB64Encode($signature);
+
+        return implode('.', $segments);
+    }
+
+    /**
+     * Sign a string with a given key and algorithm.
+     *
+     * @param string            $msg    The message to sign
+     * @param string|resource   $key    The secret key
+     * @param string            $alg    The signing algorithm.
+     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+     *
+     * @return string An encrypted message
+     *
+     * @throws DomainException Unsupported algorithm was specified
+     */
+    public static function sign($msg, $key, $alg = 'HS256')
+    {
+        if (empty(static::$supported_algs[$alg])) {
+            throw new DomainException('Algorithm not supported');
+        }
+        list($function, $algorithm) = static::$supported_algs[$alg];
+        switch($function) {
+            case 'hash_hmac':
+                return hash_hmac($algorithm, $msg, $key, true);
+            case 'openssl':
+                $signature = '';
+                $success = openssl_sign($msg, $signature, $key, $algorithm);
+                if (!$success) {
+                    throw new DomainException("OpenSSL unable to sign data");
+                } else {
+                    return $signature;
+                }
+        }
+    }
+
+    /**
+     * Verify a signature with the message, key and method. Not all methods
+     * are symmetric, so we must have a separate verify and sign method.
+     *
+     * @param string            $msg        The original message (header and body)
+     * @param string            $signature  The original signature
+     * @param string|resource   $key        For HS*, a string key works. for RS*, must be a resource of an openssl public key
+     * @param string            $alg        The algorithm
+     *
+     * @return bool
+     *
+     * @throws DomainException Invalid Algorithm or OpenSSL failure
+     */
+    private static function verify($msg, $signature, $key, $alg)
+    {
+        if (empty(static::$supported_algs[$alg])) {
+            throw new DomainException('Algorithm not supported');
+        }
+
+        list($function, $algorithm) = static::$supported_algs[$alg];
+        switch($function) {
+            case 'openssl':
+                $success = openssl_verify($msg, $signature, $key, $algorithm);
+                if ($success === 1) {
+                    return true;
+                } elseif ($success === 0) {
+                    return false;
+                }
+                // returns 1 on success, 0 on failure, -1 on error.
+                throw new DomainException(
+                    'OpenSSL error: ' . openssl_error_string()
+                );
+            case 'hash_hmac':
+            default:
+                $hash = hash_hmac($algorithm, $msg, $key, true);
+                if (function_exists('hash_equals')) {
+                    return hash_equals($signature, $hash);
+                }
+                $len = min(static::safeStrlen($signature), static::safeStrlen($hash));
+
+                $status = 0;
+                for ($i = 0; $i < $len; $i++) {
+                    $status |= (ord($signature[$i]) ^ ord($hash[$i]));
+                }
+                $status |= (static::safeStrlen($signature) ^ static::safeStrlen($hash));
+
+                return ($status === 0);
+        }
+    }
+
+    /**
+     * Decode a JSON string into a PHP object.
+     *
+     * @param string $input JSON string
+     *
+     * @return object Object representation of JSON string
+     *
+     * @throws DomainException Provided string was invalid JSON
+     */
+    public static function jsonDecode($input)
+    {
+        if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
+            /** In PHP >=5.4.0, json_decode() accepts an options parameter, that allows you
+             * to specify that large ints (like Steam Transaction IDs) should be treated as
+             * strings, rather than the PHP default behaviour of converting them to floats.
+             */
+            $obj = json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
+        } else {
+            /** Not all servers will support that, however, so for older versions we must
+             * manually detect large ints in the JSON string and quote them (thus converting
+             *them to strings) before decoding, hence the preg_replace() call.
+             */
+            $max_int_length = strlen((string) PHP_INT_MAX) - 1;
+            $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input);
+            $obj = json_decode($json_without_bigints);
+        }
+
+        if (function_exists('json_last_error') && $errno = json_last_error()) {
+            static::handleJsonError($errno);
+        } elseif ($obj === null && $input !== 'null') {
+            throw new DomainException('Null result with non-null input');
+        }
+        return $obj;
+    }
+
+    /**
+     * Encode a PHP object into a JSON string.
+     *
+     * @param object|array $input A PHP object or array
+     *
+     * @return string JSON representation of the PHP object or array
+     *
+     * @throws DomainException Provided object could not be encoded to valid JSON
+     */
+    public static function jsonEncode($input)
+    {
+        $json = json_encode($input);
+        if (function_exists('json_last_error') && $errno = json_last_error()) {
+            static::handleJsonError($errno);
+        } elseif ($json === 'null' && $input !== null) {
+            throw new DomainException('Null result with non-null input');
+        }
+        return $json;
+    }
+
+    /**
+     * Decode a string with URL-safe Base64.
+     *
+     * @param string $input A Base64 encoded string
+     *
+     * @return string A decoded string
+     */
+    public static function urlsafeB64Decode($input)
+    {
+        $remainder = strlen($input) % 4;
+        if ($remainder) {
+            $padlen = 4 - $remainder;
+            $input .= str_repeat('=', $padlen);
+        }
+        return base64_decode(strtr($input, '-_', '+/'));
+    }
+
+    /**
+     * Encode a string with URL-safe Base64.
+     *
+     * @param string $input The string you want encoded
+     *
+     * @return string The base64 encode of what you passed in
+     */
+    public static function urlsafeB64Encode($input)
+    {
+        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
+    }
+
+    /**
+     * Helper method to create a JSON error.
+     *
+     * @param int $errno An error number from json_last_error()
+     *
+     * @return void
+     */
+    private static function handleJsonError($errno)
+    {
+        $messages = array(
+            JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+            JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
+            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters' //PHP >= 5.3.3
+        );
+        throw new DomainException(
+            isset($messages[$errno])
+            ? $messages[$errno]
+            : 'Unknown JSON error: ' . $errno
+        );
+    }
+
+    /**
+     * Get the number of bytes in cryptographic strings.
+     *
+     * @param string
+     *
+     * @return int
+     */
+    private static function safeStrlen($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return mb_strlen($str, '8bit');
+        }
+        return strlen($str);
+    }
+}
diff --git a/plugins/kolab_sso/lib/Firebase/JWT/SignatureInvalidException.php b/plugins/kolab_sso/lib/Firebase/JWT/SignatureInvalidException.php
new file mode 100644
index 00000000..27332b21
--- /dev/null
+++ b/plugins/kolab_sso/lib/Firebase/JWT/SignatureInvalidException.php
@@ -0,0 +1,7 @@
+<?php
+namespace Firebase\JWT;
+
+class SignatureInvalidException extends \UnexpectedValueException
+{
+
+}
diff --git a/plugins/kolab_sso/localization/en_US.inc b/plugins/kolab_sso/localization/en_US.inc
new file mode 100644
index 00000000..012fec77
--- /dev/null
+++ b/plugins/kolab_sso/localization/en_US.inc
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Localizations for the Kolab SSO plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_sso/
+ */
+
+$labels['loginby'] = 'Login by $provider';
+$labels['sso'] = 'Single Sign On';
+$labels['errorunknown'] = 'Unknown SSO error.';
+$labels['errorinvalidresponse'] = 'Invalid SSO response.';
+$labels['errortokenfailed'] = 'Failed to get SSO token.';
+$labels['errorivalidtoken'] = 'Invalid SSO token.';
+$labels['errorinvalidrequest'] = 'Malformed SSO request.';
+$labels['errorunauthorizedclient'] = 'Unauthorized SSO client.';
+$labels['errorinvalidclient'] = 'SSO client authentication failed.';
+$labels['erroraccessdienied'] = 'SSO request denied.';
+$labels['errorunsupportedresponsetype'] = 'Unsupported SSO response type.';
+$labels['errorinvalidgrant'] = 'Invalid authorization grant.';
+$labels['errorinvalidscope'] = 'Invalid SSO scope.';
+$labels['errorservererror'] = 'SSO server error.';
+$labels['errortemporarilyunavailable'] = 'SSO service temporarily unavailable.';
+$labels['errorinteractionrequired'] = 'User interaction required.';
+$labels['errorloginrequired'] = 'User authentication required.';
+$labels['erroraccountselectionrequired'] = 'User account selection required.';
+$labels['errorconsentrequired'] = 'User consent required.';
+$labels['errorinvalidrequesturi'] = 'Invalid request_uri.';
+$labels['errorinvalidrequestobject'] = 'Invalid request object';
+$labels['errorrequestnotsupported'] = 'Request not supported.';
+$labels['errorrequesturinotsupported'] = 'Request_uri parameter not supported.';
+$labels['errorregistrationnotsupported'] = 'Registration not supported';
diff --git a/plugins/kolab_sso/localization/pl_PL.inc b/plugins/kolab_sso/localization/pl_PL.inc
new file mode 100644
index 00000000..b00a17b6
--- /dev/null
+++ b/plugins/kolab_sso/localization/pl_PL.inc
@@ -0,0 +1,25 @@
+<?php
+$labels['loginby'] = 'Zaloguj przez $provider';
+$labels['sso'] = 'Jednokrotne Logowanie';
+$labels['errorunknown'] = 'Nieznany błąd SSO.';
+$labels['errorinvalidresponse'] = 'Błędna odpowiedź SSO.';
+$labels['errortokenfailed'] = 'Nie udało się pobrać tokenu SSO.';
+$labels['errorivalidtoken'] = 'Błędny token SSO.';
+$labels['errorinvalidrequest'] = 'Nieprawidłowe żądanie SSO.';
+$labels['errorunauthorizedclient'] = 'Nieupoważniony klient SSO.';
+$labels['errorinvalidclient'] = 'Błąd uwierzytelniania SSO.';
+$labels['erroraccessdienied'] = 'Odrzucone żądanie SSO.';
+$labels['errorunsupportedresponsetype'] = 'Nieobsługiwany typ odpowiedzi SSO.';
+$labels['errorinvalidgrant'] = 'Nieprawidłowy grant autoryzacji.';
+$labels['errorinvalidscope'] = 'Błędny zakres SSO.';
+$labels['errorservererror'] = 'Błąd serwera SSO.';
+$labels['errortemporarilyunavailable'] = 'Usługa jednokrotnego logowania tymczasowo niedostępna.';
+$labels['errorinteractionrequired'] = 'Wymagana interakcja użytkownika.';
+$labels['errorloginrequired'] = 'Wymagane uwierzytelnienie użytkownika.';
+$labels['erroraccountselectionrequired'] = 'Wymagany wybór konta użytkownika.';
+$labels['errorconsentrequired'] = 'Wymagana zgoda użytkownika.';
+$labels['errorinvalidrequesturi'] = 'Błędny request_uri.';
+$labels['errorinvalidrequestobject'] = 'Błędny obiekt żądania.';
+$labels['errorrequestnotsupported'] = 'Żądanie nie obsługiwane.';
+$labels['errorrequesturinotsupported'] = 'Parametr request_uri nie obsługiwany.';
+$labels['errorregistrationnotsupported'] = 'Rejestracja nie obsługiwana.';
diff --git a/plugins/kolab_tags/composer.json b/plugins/kolab_tags/composer.json
index ebbf8073..80c5218c 100644
--- a/plugins/kolab_tags/composer.json
+++ b/plugins/kolab_tags/composer.json
@@ -4,7 +4,7 @@
     "description": "Email tags plugin",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -21,6 +21,6 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libkolab": ">=3.2.8"
+        "kolab/libkolab": ">=3.4.0"
     }
 }
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/_skin b/plugins/kolab_tags/helpdocs/en_US/_static/_skin
new file mode 120000
index 00000000..01372893
--- /dev/null
+++ b/plugins/kolab_tags/helpdocs/en_US/_static/_skin
@@ -0,0 +1 @@
+larry
\ No newline at end of file
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-cloud.png b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-cloud.png
new file mode 100644
index 00000000..103ae65a
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-cloud.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-mark-menu.png b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-mark-menu.png
new file mode 100644
index 00000000..189da011
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-mark-menu.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-messagelist.png b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-messagelist.png
new file mode 100644
index 00000000..e30f3054
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-messagelist.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-other.png b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-other.png
new file mode 100644
index 00000000..4cc24314
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/kolab/tags-other.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-cloud.png b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-cloud.png
new file mode 100644
index 00000000..9102cb36
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-cloud.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-mark-menu.png b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-mark-menu.png
new file mode 100644
index 00000000..b9c1cbf5
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-mark-menu.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-messagelist.png b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-messagelist.png
new file mode 100644
index 00000000..c2cb7094
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-messagelist.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-other.png b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-other.png
new file mode 100644
index 00000000..f12eafd1
Binary files /dev/null and b/plugins/kolab_tags/helpdocs/en_US/_static/larry/tags-other.png differ
diff --git a/plugins/kolab_tags/helpdocs/en_US/mail.rst b/plugins/kolab_tags/helpdocs/en_US/mail.rst
new file mode 100644
index 00000000..47d84188
--- /dev/null
+++ b/plugins/kolab_tags/helpdocs/en_US/mail.rst
@@ -0,0 +1,44 @@
+.. index:: Tags
+.. _mail-tags:
+
+====
+Tags
+====
+
+Like folders, tags is a way to separate and organize Emails. Tags are showing up as a colored reference in the subject line of the referenced Emails.
+
+    .. image:: _static/_skin/tags-messagelist.png
+
+Tags can be reused across the Kolab components - Email, Calendar, Notes, Files and Tasks.
+
+    .. image:: _static/_skin/tags-other.png
+
+When a tag is associated with a number of Emails, these Emails can be listed by clicking the tag in the tag-cloud.
+It is possible to select more than one tag using CTRL key. This way one can display messages associated with all selected tags.
+
+The tag-cloud can be found under the :ref:`folder list <mail-folders>` in the Email view. It is showing all available tags.
+
+    .. image:: _static/_skin/tags-cloud.png
+
+
+Creating a tag
+^^^^^^^^^^^^^^
+
+Tags can be created, either from the manage menu (see above) or from the dropdown menu in the mail view. Rightclick on an Email in the list, and select "Mark -> Tag as...".
+
+    .. image:: _static/_skin/tags-mark-menu.png
+
+
+Managing tags
+^^^^^^^^^^^^^
+
+Tags can be managed through the menu in the tag-cloud. The menu is opened by clicking the wheel in the buttom of the tag-cloud.
+Here you can add/remove tags or modify their name and color.
+
+Tags are associated to Email messages via the drop-down menu in the Email list.
+
+
+Deleting tags
+^^^^^^^^^^^^^
+
+A tag which is no longer needed can be removed via the tag-cloud menu. This will remove the tag from the cloud and the references to the associated Emails. The Emails will however remain.
diff --git a/plugins/kolab_tags/helpdocs/po/mail.pot b/plugins/kolab_tags/helpdocs/po/mail.pot
new file mode 100644
index 00000000..dfda92c9
--- /dev/null
+++ b/plugins/kolab_tags/helpdocs/po/mail.pot
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Roundcube Webmail Help 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-30 08:11\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:9
+# 1dc1760850df40c897398e827760d1be
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:11
+# 8dc48bf0b480455e87702ef619ffda19
+msgid "Like folders, tags is a way to separate and organize Emails. Tags are showing up as a colored reference in the subject line of the referenced Emails."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:15
+# 8f9300e9b466481ca01abbccca58b74c
+msgid "Tags can be reused across the Kolab components - Email, Calendar, Notes, Files and Tasks."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:19
+# f9d9d4941dc4470ca70efb2dba17ebe0
+msgid "When a tag is associated with a number of Emails, these Emails can be listed by clicking the tag in the tag-cloud. It is possible to select more than one tag using CTRL key. This way one can display messages associated with all selected tags."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:22
+# dcb4832f54f04afeb4c3072500ce6a81
+msgid "The tag-cloud can be found under the :ref:`folder list <mail-folders>` in the Email view. It is showing all available tags."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:28
+# 9ff403451b5a43d4ad6384aede45348c
+msgid "Creating a tag"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:30
+# 4a2a148e04614be480d412a3f9a1403c
+msgid "Tags can be created, either from the manage menu (see above) or from the dropdown menu in the mail view. Rightclick on an Email in the list, and select \"Mark -> Tag as...\"."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:36
+# b01add6c2a734d60ae7f65ddbffd3b4b
+msgid "Managing tags"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:38
+# 4c986569129c4ca087363341d6becbf7
+msgid "Tags can be managed through the menu in the tag-cloud. The menu is opened by clicking the wheel in the buttom of the tag-cloud. Here you can add/remove tags or modify their name and color."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:41
+# ae55ddb468b54934a3997e399664c2aa
+msgid "Tags are associated to Email messages via the drop-down menu in the Email list."
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:45
+# c9882b94e0fd41328b2e18f21721eb63
+msgid "Deleting tags"
+msgstr ""
+
+#: ../../en_US/_plugins/kolab_tags/mail.rst:47
+# c738c03404424c7b989095468961e5dd
+msgid "A tag which is no longer needed can be removed via the tag-cloud menu. This will remove the tag from the cloud and the references to the associated Emails. The Emails will however remain."
+msgstr ""
+
diff --git a/plugins/kolab_tags/kolab_tags.js b/plugins/kolab_tags/kolab_tags.js
index 222fdf95..ffdd8702 100644
--- a/plugins/kolab_tags/kolab_tags.js
+++ b/plugins/kolab_tags/kolab_tags.js
@@ -26,7 +26,7 @@
  */
 
 window.rcmail && rcmail.addEventListener('init', function() {
-    if (rcmail.task == 'mail') {
+    if (/^(mail|notes|tasks)$/.test(rcmail.task)) {
         var msg_view = rcmail.env.action == 'show' || rcmail.env.action == 'preview';
 
         if (!msg_view && rcmail.env.action) {
@@ -35,7 +35,13 @@ window.rcmail && rcmail.addEventListener('init', function() {
 
         // load tags cloud
         if (rcmail.gui_objects.taglist) {
-            load_tags();
+            // Tags for kolab_notes plugin have to be initialized via an event
+            if (rcmail.task == 'notes' && !window.kolabnotes) {
+                rcmail.addEventListener('kolab-notes-init', load_tags);
+            }
+            else {
+                load_tags();
+            }
         }
 
         // display tags in message subject (message window)
@@ -60,6 +66,32 @@ window.rcmail && rcmail.addEventListener('init', function() {
         rcmail.register_command('tag-remove', function(props, obj, event) { tag_remove(props, obj, event); });
         rcmail.register_command('tag-remove-all', function() { tag_remove('*'); });
 
+        // Disable tag functionality in contextmenu in Roundcube < 1.4
+        if (!rcmail.env.rcversion) {
+            rcmail.addEventListener('menu-open', function(e) {
+                if (e.name == 'rcm_markmessagemenu') {
+                    $.each(['add', 'remove', 'remove-all'], function() {
+                        $('a.cmd_tag-' + this).parent().hide();
+                    });
+                }
+            });
+        }
+        // Set activation state for contextmenu entries related with tags management
+        else {
+            rcmail.addEventListener('contextmenu_init', function(menu) {
+                if (menu.menu_name == 'folderlist') {
+                    menu.addEventListener('activate', function(p) {
+                        if (p.command == 'manage-tags') {
+                            return true;
+                        }
+                        if (p.command == 'reset-tags') {
+                            return !!(tagsfilter.length && main_list_widget());
+                        }
+                    });
+                }
+            });
+        }
+
         // ajax response handler
         rcmail.addEventListener('plugin.kolab_tags', update_tags);
 
@@ -73,16 +105,34 @@ window.rcmail && rcmail.addEventListener('init', function() {
                     $('a.menuselector span', $(this).parent()).text(title);
                 });
         }
+
+        // Allow other plugins to update tags list
+        rcmail.addEventListener('kolab-tags-counts', update_counts)
+            .addEventListener('kolab-tags-refresh', refresh_tags);
     }
 });
 
-var tagsfilter = [], tag_selector_element, tag_form_data, tag_form_save_func,
+var tag_selector_element, tag_form_data, tag_form_save_func,
+    tagsfilter = [], 
+    tagscounts = [],
     reset_css = {color: '', backgroundColor: ''};
 
+function main_list_widget()
+{
+    if (rcmail.task == 'mail' && rcmail.message_list)
+        return rcmail.message_list;
+
+    if (rcmail.task == 'notes' && rcmail.noteslist)
+        return rcmail.noteslist;
+
+    if (rcmail.task == 'tasks' && rcmail.gui_objects.resultlist)
+        return rcmail.gui_objects.resultlist;
+}
+
 // fills tag cloud with tags list
 function load_tags()
 {
-    var ul = $('#taglist'), clickable = rcmail.message_list;
+    var ul = $('#taglist'), clickable = !!main_list_widget();
 
     $.each(rcmail.env.tags, function(i, tag) {
         var li = add_tag_element(ul, tag, clickable);
@@ -98,18 +148,20 @@ function load_tags()
         }
     });
 
+    rcmail.triggerEvent('kolab-tags-update', {});
     rcmail.enable_command('reset-tags', tagsfilter.length && clickable);
 }
 
 function add_tag_element(list, tag, clickable)
 {
-    // @todo: .append('<span class="count"></span>')
-    var element = $('<li>').text(tag.name).data('tag', tag.uid).appendTo(list);
+    var element = $('<li>').attr('class', tag_class_name(tag))
+        .text(tag.name).data('tag', tag.uid)
+        .append('<span class="count">')
+        .appendTo(list);
 
     if (clickable) {
         element.click(function(e) {
-            var item = $(this),
-                tagid = item.data('tag');
+            var tagid = element.data('tag');
 
             if (!tagid)
                 return false;
@@ -129,12 +181,12 @@ function add_tag_element(list, tag, clickable)
 
             // add tag to the filter
             if (index < 0) {
-                item.addClass('selected');
-                tag_set_color(item, t);
+                element.addClass('selected');
+                tag_set_color(element, t);
                 tagsfilter.push(tagid);
             }
             else if (shift) {
-                item.removeClass('selected').css(reset_css);
+                element.removeClass('selected').css(reset_css);
                 tagsfilter.splice(index, 1);
             }
 
@@ -146,30 +198,58 @@ function add_tag_element(list, tag, clickable)
 
             e.preventDefault();
             return false;
-        })
+        });
+
+        if (!$('html.touch').length) {
+            element.draggable({
+                addClasses: false,
+                cursor: 'default',
+                cursorAt: {left: -10},
+                revert: 'invalid',
+                revertDuration: 300,
+                helper: tag_draggable_helper,
+                start: tag_draggable_start,
+                appendTo: 'body'
+            });
+        }
     }
 
     return element;
 }
 
+function update_counts(p)
+{
+    $('#taglist > li').each(function(i,li) {
+        var elem = $(li), tagid = elem.data('tag'),
+            tag = tag_find(tagid);
+            count = tag && p.counter ? p.counter[tag.name] : '';
+
+            elem.children('.count').text(count ? count : '');
+    });
+
+    tagscounts = p.counter;
+}
+
 function manage_tags()
 {
     // display it as popup
     rcmail.tags_popup = rcmail.show_popup_dialog(
-        '<div id="tagsform"><select size="8" multiple="multiple"></select><div class="buttons"></div></div>',
+        '<div id="tagsform"><select size="6" multiple="multiple"></select><div class="buttons"></div></div>',
         rcmail.gettext('kolab_tags.tags'),
         [{
             text: rcmail.gettext('save'),
-            'class': 'mainaction',
+            'class': 'mainaction save',
             click: function() { if (tag_form_save()) $(this).dialog('close'); }
         },
         {
             text: rcmail.gettext('cancel'),
+            'class': 'cancel',
             click: function() { $(this).dialog('close'); }
         }],
         {
             width: 400,
             modal: true,
+            classes: {'ui-dialog-content': 'formcontent'},
             closeOnEscape: true,
             close: function(e, ui) {
                 $(this).remove();
@@ -183,12 +263,15 @@ function manage_tags()
     var form = $('#tagsform'),
         select = $('select', form),
         buttons = [
-            $('<input type="button" />').val(rcmail.gettext('kolab_tags.add'))
+            $('<button type="button" class="btn btn-secondary create">')
+                .text(rcmail.gettext('kolab_tags.add'))
                 .click(function() { tag_form_dialog(); }),
-            $('<input type="button" />').val(rcmail.gettext('kolab_tags.edit'))
+            $('<button type="button" class="btn btn-secondary edit">')
+                .text(rcmail.gettext('kolab_tags.edit'))
                 .attr('disabled', true)
                 .click(function() { tag_form_dialog((select.val())[0]); }),
-            $('<input type="button" />').val(rcmail.gettext('kolab_tags.delete'))
+            $('<button type="button" class="btn btn-danger delete">')
+                .text(rcmail.gettext('kolab_tags.delete'))
                 .attr('disabled', true)
                 .click(function() {
                     $.each(select.val() || [], function(i, v) {
@@ -210,6 +293,7 @@ function manage_tags()
 
     $.each(rcmail.env.tags, function(i, v) {
         $('<option>').val(v.uid).text(v.name)
+            .attr('class', tag_class_name(v))
             .on('dblclick', function() { tag_form_dialog(v.uid); })
             .appendTo(select);
     });
@@ -220,11 +304,15 @@ function manage_tags()
 function tag_form_dialog(id)
 {
     var tag, form = $('#tagsform'),
-        content = $('<div id="tageditform"></div>'),
-        name_input = $('<input type="text" size="25" id="tag-form-name" />'),
-        color_input = $('<input type="text" size="6" class="colors" id="tag-form-color" />'),
-        name_label = $('<label for="tag-form-name">').text(rcmail.gettext('kolab_tags.tagname')),
-        color_label = $('<label for="tag-form-color">').text(rcmail.gettext('kolab_tags.tagcolor'));
+        content = $('<div id="tageditform">'),
+        row1 = $('<div class="form-group row">'),
+        row2 = $('<div class="form-group row">'),
+        name_input = $('<input type="text" size="25" id="tag-form-name" class="form-control">'),
+        color_input = $('<input type="text" size="6" id="tag-form-color" class="colors form-control">'),
+        name_label = $('<label for="tag-form-name" class="col-form-label col-sm-2">')
+            .text(rcmail.gettext('kolab_tags.tagname')),
+        color_label = $('<label for="tag-form-color" class="col-form-label col-sm-2">')
+            .text(rcmail.gettext('kolab_tags.tagcolor'));
 
     tag_form_save_func = function() {
         var i, tag, name = $.trim(name_input.val()), color = $.trim(color_input.val());
@@ -302,9 +390,11 @@ function tag_form_dialog(id)
     // display form
     form.children().hide();
     form.append(content);
-    content.append([name_label, name_input, '<br>', color_label, color_input]).show();
+    content.append(row1.append(name_label).append($('<div class="col-sm-10">').append(name_input)))
+        .append(row2.append(color_label).append($('<div class="col-sm-10">').append(color_input)))
+        .show();
     name_input.focus();
-    color_input.miniColors({colorValues: rcmail.env.mscolors});
+    color_input.minicolors(rcmail.env.minicolors_config || {});
 }
 
 // save tags form (create/update/delete tags)
@@ -349,6 +439,29 @@ function update_tags(response)
     // reset tag selector popup
     tag_selector_reset();
 
+    if (response.refresh) {
+        var list = $('#taglist');
+
+        tagsfilter = $.map(list.children('.selected'), function(li) {
+            return $(li).data('tag');
+        });
+
+        list.html('');
+        load_tags();
+        update_counts({counter: tagscounts});
+
+        if (tagsfilter.length) {
+            list.children('li').each(function() {
+                if ($.inArray($(this).data('tag'), tagsfilter) > -1) {
+                    $(this).addClass('selected');
+                }
+            });
+            apply_tags_filter();
+        }
+
+        return;
+    }
+
     // remove deleted tags
     remove_tags(response['delete'], response.mark);
 
@@ -366,9 +479,9 @@ function update_tags(response)
         var i, old, tag = this, id = tag.uid,
             filter = function() { return $(this).data('tag') == id; },
             tagbox = $('#taglist li').filter(filter),
-            elements = $('span.tagbox').filter(filter),
+            elements = $('.tagbox').filter(filter),
             win = rcmail.get_frame_window(rcmail.env.contentframe),
-            framed = win && win.jQuery ? win.jQuery('span.tagbox').filter(function() { return win.jQuery(this).data('tag') == id; }) : [];
+            framed = win && win.jQuery ? win.jQuery('.tagbox').filter(function() { return win.jQuery(this).data('tag') == id; }) : [];
             selected = $.inArray(String(id), tagsfilter);
 
         for (i in rcmail.env.tags)
@@ -396,6 +509,7 @@ function update_tags(response)
         rcmail.env.tags[i] = tag;
     });
 
+    rcmail.triggerEvent('kolab-tags-update', {});
     rcmail.enable_command('reset-tags', tagsfilter.length && list);
 
     // update Mark menu in case some messages are already selected
@@ -414,7 +528,8 @@ function remove_tags(tags, selection)
     }
 
     var taglist = $('#taglist li'),
-        tagboxes = $((selection && rcmail.message_list ? 'tr.selected ' : '') + 'span.tagbox'),
+        list = main_list_widget(),
+        tagboxes = $('span.tagbox'),
         win = rcmail.get_frame_window(rcmail.env.contentframe),
         frame_tagboxes = win && win.jQuery ? win.jQuery('span.tagbox') : [],
         update_filter = false;
@@ -452,11 +567,28 @@ function remove_tags(tags, selection)
         }
     });
 
-    if (update_filter && rcmail.message_list) {
+    if (update_filter && list) {
         apply_tags_filter();
     }
 }
 
+// kolab-tags-refresh event handler, allowing plugins to refresh
+// the tags list e.g. when a new tag is created
+function refresh_tags(e)
+{
+    // find a new tag
+    $.each(e.tags || [], function() {
+        for (var i in rcmail.env.tags) {
+            if (rcmail.env.tags[i].name == this) {
+                return;
+            }
+        }
+
+        rcmail.http_post('plugin.kolab_tags', {_act: 'refresh'}, rcmail.display_message(rcmail.get_label('loading'), 'loading'));
+        return false;
+    });
+}
+
 // unselect all selected tags in the tag cloud
 function reset_tags()
 {
@@ -470,7 +602,7 @@ function reset_tags()
 function tag_add(props, obj, event)
 {
     if (!props) {
-        return tag_selector(event, function(props) { rcmail.command('tag-add', props); });
+        return tag_selector(event, function(props) { tag_add(props); });
     }
 
     var tag, postdata = rcmail.selection_post_data();
@@ -508,15 +640,16 @@ function tag_add_callback(tag)
     if (!tag)
         return;
 
-    var frame_window = rcmail.get_frame_window(rcmail.env.contentframe);
+    var frame_window = rcmail.get_frame_window(rcmail.env.contentframe),
+        list = rcmail.message_list;
 
-    if (rcmail.message_list) {
-        $.each(rcmail.message_list.get_selection(), function (i, uid) {
-            var row = rcmail.message_list.rows[uid];
+    if (list) {
+        $.each(list.get_selection(), function (i, uid) {
+            var row = list.rows[uid];
             if (!row)
                 return;
 
-            var subject = $('td.subject > a', row.obj);
+            var subject = $('td.subject a', row.obj);
 
             if ($('span.tagbox', subject).filter(function() { return $(this).data('tag') == tag.uid; }).length) {
                 return;
@@ -524,6 +657,8 @@ function tag_add_callback(tag)
 
             subject.prepend(tag_box_element(tag));
         });
+
+        message_list_select(list);
     }
 
     (frame_window && frame_window.message_tags ? frame_window : window).message_tags([tag], true);
@@ -533,7 +668,7 @@ function tag_add_callback(tag)
 function tag_remove(props, obj, event)
 {
     if (!props) {
-        return tag_selector(event, function(props) { rcmail.command('tag-remove', props); });
+        return tag_selector(event, function(props) { tag_remove(props); }, true);
     }
 
     if (props.name) {
@@ -554,13 +689,58 @@ function tag_remove(props, obj, event)
     postdata._act = 'remove';
 
     rc.http_post('plugin.kolab_tags', postdata, true);
+
+    // remove tags from message(s) without waiting to a response
+    // in case of an error the list will be refreshed
+    tag_remove_callback(this.tag_find(props));
 }
 
+// update messages list and message frame after removing tag assignments
+function tag_remove_callback(tag)
+{
+    if (!tag)
+        return;
+
+    var frame_window = rcmail.get_frame_window(rcmail.env.contentframe),
+        list = rcmail.message_list;
+
+    if (list) {
+        $.each(list.get_selection(), function (i, uid) {
+            var row = list.rows[uid];
+            if (row) {
+                $('span.tagbox', row.obj).each(function() {
+                    if (!tag || $(this).data('tag') == tag.uid) {
+                        $(this).remove();
+                    }
+                });
+            }
+        });
+
+        message_list_select(list);
+    }
+
+    // TODO: remove tag(s) from the preview frame
+}
+
+
 // executes messages search according to selected messages
 function apply_tags_filter()
 {
-    rcmail.enable_command('reset-tags', tagsfilter.length && rcmail.message_list);
-    rcmail.qsearch();
+    rcmail.enable_command('reset-tags', tagsfilter.length && main_list_widget());
+
+    if (rcmail.task == 'mail')
+        rcmail.qsearch();
+    else {
+        // Convert tag id to tag label
+        var tags = [];
+        $.each(rcmail.env.tags, function() {
+            if ($.inArray(this.uid, tagsfilter) > -1) {
+                tags.push(this.name);
+            }
+        });
+
+        rcmail.triggerEvent('kolab-tags-search', tags);
+    }
 }
 
 // adds _tags argument to http search request
@@ -584,8 +764,22 @@ function search_request(url)
 
 function message_list_select(list)
 {
-    rcmail.enable_command('tag-remove', 'tag-remove-all', rcmail.env.tags.length && list.selection.length);
-    rcmail.enable_command('tag-add', list.selection.length);
+    var selection = list.get_selection(),
+        has_tags = selection.length && rcmail.env.tags.length;
+
+    if (has_tags && !rcmail.select_all_mode) {
+        has_tags = false;
+        $.each(selection, function() {
+            var row = list.rows[this];
+            if (row && row.obj && $('span.tagbox', row.obj).length) {
+                has_tags = true;
+                return false;
+            }
+        });
+    }
+
+    rcmail.enable_command('tag-remove', 'tag-remove-all', has_tags);
+    rcmail.enable_command('tag-add', selection.length);
 }
 
 // add tags to message subject on message list
@@ -604,7 +798,7 @@ function message_list_update_tags(e)
         if (!row)
             return;
 
-        var subject = $('td.subject > a', row.obj),
+        var subject = $('td.subject a', row.obj),
             boxes = [];
 
         $('span.tagbox', subject).remove();
@@ -626,7 +820,7 @@ function message_list_update_tags(e)
 // add tags to message subject in message preview
 function message_tags(tags, merge)
 {
-    var boxes = [], subject_tag = $('#messageheader .subject');
+    var boxes = [], subject_tag = $('#messageheader .subject,#message-header h2.subject'); // Larry and Elastic
 
     $.each(tags || [], function (i, tag) {
         if (merge) {
@@ -678,6 +872,10 @@ function tag_box_element(tag, del_btn)
 function tag_set_color(obj, tag)
 {
     if (obj && tag.color) {
+        if (rcmail.triggerEvent('kolab-tag-color', {obj: obj, tag: tag}) === false) {
+            return;
+        }
+
         var style = 'background-color: ' + tag.color + ' !important';
 
         // choose black text color when background is bright, white otherwise
@@ -694,9 +892,10 @@ function tag_set_color(obj, tag)
 }
 
 // create tag selector popup, position and display it
-function tag_selector(event, callback)
+function tag_selector(event, callback, remove_mode)
 {
-    var container = tag_selector_element;
+    var container = tag_selector_element,
+        max_items = 10;
 
     if (!container) {
         var rows = [],
@@ -706,7 +905,6 @@ function tag_selector(event, callback)
             span = document.createElement('span');
 
         link.href = '#';
-        link.className = 'active';
         container = $('<div id="tag-selector" class="popupmenu"></div>')
             .keydown(function(e) {
                 var focused = $('*:focus', container).parent();
@@ -726,16 +924,11 @@ function tag_selector(event, callback)
 
         // loop over tags list
         $.each(rcmail.env.tags, function(i, tag) {
-            var a = link.cloneNode(false), row = li.cloneNode(false);
-
-            a.onclick = function(e) {
-                container.data('callback')(tag.uid);
-                return rcmail.hide_menu('tag-selector', e);
-            };
+            var a = link.cloneNode(false), row = li.cloneNode(false), tmp = span.cloneNode(false);
 
             // add tag name element
-            tmp = span.cloneNode(false);
             $(tmp).text(tag.name);
+            $(a).data('uid', tag.uid).attr('class', 'tag active ' + tag_class_name(tag));
             a.appendChild(tmp);
 
             row.appendChild(a);
@@ -746,11 +939,15 @@ function tag_selector(event, callback)
 
         // temporarily show element to calculate its size
         container.css({left: '-1000px', top: '-1000px'})
-            .appendTo(document.body).show();
+            .appendTo(document.body).show()
+            .on('click', 'a.tag', function(e) {
+                container.data('callback')($(this).data('uid'));
+                return rcmail.hide_menu('tag-selector', e);
+            });
 
         // set max-height if the list is long
-        if (rows.length > 10)
-            container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9)
+        if (rows.length > max_items)
+            container.css('max-height', $('li', container)[0].offsetHeight * max_items + (max_items-1))
 
         tag_selector_element = container;
     }
@@ -762,6 +959,36 @@ function tag_selector(event, callback)
     // reset list and search input
     $('li', container).show();
     $('input', container).val('').focus();
+
+    // When displaying tags for remove we hide those that are not in a selected messages set
+    if (remove_mode && rcmail.message_list) {
+        var tags = [], selection = rcmail.message_list.get_selection();
+
+        if (selection.length
+            && selection.length <= rcmail.env.messagecount
+            && (!rcmail.select_all_mode || selection.length == rcmail.env.messagecount)
+        ) {
+            $.each(selection, function (i, uid) {
+                var row = rcmail.message_list.rows[uid];
+                if (row) {
+                   $('span.tagbox', row.obj).each(function() { tags.push($(this).data('tag')); });
+                }
+            });
+
+            tags = $.uniqueSort(tags);
+
+            $('a', container).each(function() {
+                if ($.inArray($(this).data('uid'), tags) == -1) {
+                    $(this).parent().hide();
+                }
+            });
+        }
+
+        // we also hide the search input, if there's not many tags left
+        if ($('a:visible', container).length < max_items) {
+            $('input', container).parents('li').hide();
+        }
+    }
 }
 
 // remove tag selector element (e.g. after adding/removing a tag)
@@ -769,40 +996,264 @@ function tag_selector_reset()
 {
     $(tag_selector_element).remove();
     tag_selector_element = null;
+
+    // Elastic requires to destroy the menu, otherwise we end up with
+    // content element duplicates that are not connected with the menu
+    if (window.UI && window.UI.menu_destroy) {
+        window.UI.menu_destroy('tag-selector');
+    }
 }
 
 function tag_selector_search_element(container)
 {
     var title = rcmail.gettext('kolab_tags.tagsearchnew'),
-        placeholder = rcmail.gettext('kolab_tags.newtag');
-
-    var input = $('<input>').attr({'type': 'text', title: title, placeholder: placeholder})
-        .keyup(function(e) {
-            if (this.value) {
-                // execute action on Enter
-                if (e.which == 13) {
-                    container.data('callback')({name: this.value});
-                    rcmail.hide_menu('tag-selector', e);
-                    if ($('#markmessagemenu').is(':visible')) {
-                        rcmail.hide_menu('markmessagemenu', e);
+        placeholder = rcmail.gettext('kolab_tags.newtag'),
+        form = $('<span class="input-group"><span class="input-group-prepend"><i class="input-group-text icon search"></i></span></span>'),
+        input = $('<input>').attr({'type': 'text', title: title, placeholder: placeholder, 'class': 'form-control'})
+            .keyup(function(e) {
+                if (this.value) {
+                    // execute action on Enter
+                    if (e.which == 13) {
+                        container.data('callback')({name: this.value});
+                        rcmail.hide_menu('tag-selector', e);
+                        if ($('#markmessagemenu').is(':visible')) {
+                            rcmail.hide_menu('markmessagemenu', e);
+                        }
+                    }
+                    // search tags
+                    else {
+                        var search = this.value.toUpperCase();
+                        $('li:not(.search)', container).each(function() {
+                            var tag_name = $(this).text().toUpperCase();
+                            $(this)[tag_name.indexOf(search) >= 0 ? 'show' : 'hide']();
+                        });
                     }
                 }
-                // search tags
                 else {
-                    var search = this.value.toUpperCase();
-                    $('li:not(.search)', container).each(function() {
-                        var tag_name = $(this).text().toUpperCase();
-                        $(this)[tag_name.indexOf(search) >= 0 ? 'show' : 'hide']();
-                    });
+                    // reset search
+                    $('li', container).show();
                 }
+            });
+
+    return $('<li class="search">').append(form.append(input))
+        // prevents from closing the menu on click in the input/row
+        .on('mouseup click', function(e) { e.stopPropagation(); return false; });
+}
+
+function tag_class_name(tag)
+{
+    return 'kolab-tag-' + tag.uid.replace(/[^a-z0-9]/ig, '');
+}
+
+function kolab_tags_input(element, tags, readonly)
+{
+    var list,
+        tagline = $(element)[readonly ? 'addClass' : 'removeClass']('disabled').empty().show(),
+        source_callback = function(request, response) {
+            request = request.term.toUpperCase();
+            response($.map(rcmail.env.tags || [], function(v) {
+                if (request.length && v.name.toUpperCase().indexOf(request) > -1)
+                    return v.name;
+            }));
+        };
+
+    $.each(tags && tags.length ? tags : [''], function(i,val) {
+        $('<input>').attr({name: 'tags[]', tabindex: '0', 'class': 'tag'})
+            .val(val)
+            .appendTo(tagline);
+    });
+
+    if (!tags || !tags.length) {
+        $('<span>').addClass('placeholder')
+            .text(rcmail.gettext('kolab_tags.notags'))
+            .appendTo(tagline)
+            .click(function(e) { list.trigger('click'); });
+    }
+
+    $('input.tag', element).tagedit({
+        animSpeed: 100,
+        allowEdit: false,
+        allowAdd: !readonly,
+        allowDelete: !readonly,
+        checkNewEntriesCaseSensitive: false,
+        autocompleteOptions: { source: source_callback, minLength: 0, noCheck: true },
+        texts: { removeLinkTitle: rcmail.gettext('kolab_tags.untag') }
+    });
+
+    list = element.find('.tagedit-list');
+
+    list.addClass('form-control'); // Elastic
+
+    if (!readonly) {
+        list.on('click', function() { $('.placeholder', element).hide(); });
+    }
+
+    // Track changes on the list to style tag elements
+    if (window.MutationObserver) {
+        var observer = new MutationObserver(kolab_tags_input_update);
+        observer.observe(list[0], {childList: true});
+    }
+    else {
+        list.on('click keyup', kolab_tags_input_update);
+    }
+
+    kolab_tags_input_update({target: list});
+
+    return list;
+}
+
+function kolab_tags_input_update(e)
+{
+    var tags = {},
+        target = e.length && e[0].target ? e[0].target : e.target;
+
+    // first generate tags list indexed by name
+    $.each(rcmail.env.tags, function(i, tag) {
+        tags[tag.name] = tag;
+    });
+
+    $(target).find('li.tagedit-listelement-old:not([class*="tagbox"])').each(function() {
+        var text = $('span', this).text();
+
+        $(this).addClass('tagbox');
+
+        if (tags[text]) {
+            $(this).data('tag', tags[text].uid);
+            tag_set_color(this, tags[text]);
+        }
+    });
+}
+
+function kolab_tags_input_value(element)
+{
+    var tags = [];
+
+    $(element || '.tagedit-list').find('input').each(function(i, elem) {
+        if (elem.value)
+            tags.push(elem.value);
+    });
+
+    return tags;
+}
+
+function tag_draggable_helper()
+{
+    var draghelper = $('.tag-draghelper'),
+        tagid = $(this).data('tag'),
+        node = $(this).clone(),
+        tagbox = $('<span class="tagbox">');
+
+    if (!draghelper.length) {
+        draghelper = $('<div class="tag-draghelper"></div>');
+    }
+
+    $('span.count', node).remove();
+    tagbox.text(node.text()).appendTo(draghelper.html(''));
+    tag_set_color(tagbox, tag_find(tagid));
+
+    return draghelper[0];
+}
+
+function tag_draggable_start(event, ui)
+{
+    if (rcmail.gui_objects.noteslist) {
+        // register notes list to receive drop events
+        $('tr', rcmail.gui_objects.noteslist).droppable({
+            addClasses: false,
+            hoverClass: 'droptarget',
+            accept: tag_droppable_accept,
+            drop: tag_draggable_dropped
+        });
+
+        // allow to drop tags onto note edit form
+        $('body.task-notes .content.formcontainer,#notedetailstitle.boxtitle').droppable({
+            addClasses: false,
+            accept: function() { return $(this).is('.formcontainer,.boxtitle'); },
+            drop: function(event, ui) {
+                var tag = tag_find(ui.draggable.data('tag'));
+                $('#tagedit-input').val(tag.name).trigger('transformToTag');
+                $('.tagline .placeholder', rcmail.gui_objects.noteviewtitle).hide();
             }
-            else {
-                // reset search
-                $('li', container).show();
+        }).addClass('tag-droppable');
+    }
+    else if (rcmail.task == 'tasks' && rcmail.gui_objects.resultlist) {
+
+        $('div.taskhead', rcmail.gui_objects.resultlist).droppable({
+            addClasses: false,
+            hoverClass: 'droptarget',
+            accept: tag_droppable_accept,
+            drop: tag_draggable_dropped
+        });
+
+
+        // allow to drop tags onto task edit form
+        $('body.task-tasks .content.formcontainer').droppable({
+            addClasses: false,
+            accept: function() { return $(this).is('.formcontainer') && $('#taskedit').is(':visible'); },
+            drop: function(event, ui) {
+                var tag = tag_find(ui.draggable.data('tag'));
+                $('#tagedit-input').val(tag.name).trigger('transformToTag');
+            }
+        }).addClass('tag-droppable');
+    }
+}
+
+function tag_draggable_dropped(event, ui)
+{
+    var drop_id = tag_draggable_target_id(this),
+        tag = tag_find(ui.draggable.data('tag')),
+        list = $(this).parent();
+
+    rcmail.triggerEvent('kolab-tags-drop', {id: drop_id, tag: tag.name, list: list});
+}
+
+function tag_droppable_accept(draggable)
+{
+    if (rcmail.busy) {
+        return false;
+    }
+
+    var drop_id = tag_draggable_target_id(this),
+        tag = tag_find(draggable.data('tag')),
+        data = rcmail.triggerEvent('kolab-tags-drop-data', {id: drop_id});
+
+    // target already has this tag assigned
+    if (!data || !tag || (data.tags && $.inArray(tag.name, data.tags) >= 0)) {
+        return false;
+    }
+
+    return true;
+}
+
+function tag_draggable_target_id(elem)
+{
+    var id = $(elem).attr('id');
+
+    if (id) {
+        id = id.replace(/^rcmrow/, ''); // Notes
+    }
+    else {
+        id = $(elem).parent().attr('rel'); // Tasks
+    }
+
+    return id;
+}
+
+// Convert list of tag names into "blocks" and add to the specified element
+function kolab_tags_text_block(tags, element, del_btn)
+{
+    if (tags && tags.length) {
+        var items = [];
+
+        tags.sort();
+
+        $.each(tags, function(i,val) {
+            var tag = tag_find(val, 'name');
+            if (tag) {
+                items.push(tag_box_element(tag, del_btn));
             }
         });
 
-    return $('<li class="search">').append(input)
-        // prevents from closing the menu on click in the input/row
-        .mouseup(function(e) { return false; });
-}
+        $(element).append(items);
+    }
+};
diff --git a/plugins/kolab_tags/kolab_tags.php b/plugins/kolab_tags/kolab_tags.php
index 12fbb01d..ec47f7f3 100644
--- a/plugins/kolab_tags/kolab_tags.php
+++ b/plugins/kolab_tags/kolab_tags.php
@@ -23,7 +23,7 @@
 
 class kolab_tags extends rcube_plugin
 {
-    public $task = 'mail';
+    public $task = 'mail|notes|tasks';
     public $rc;
     public $home;
 
diff --git a/plugins/kolab_tags/lib/kolab_tags_engine.php b/plugins/kolab_tags/lib/kolab_tags_engine.php
index 4e15069b..1c45040f 100644
--- a/plugins/kolab_tags/lib/kolab_tags_engine.php
+++ b/plugins/kolab_tags/lib/kolab_tags_engine.php
@@ -46,12 +46,7 @@ class kolab_tags_engine
      */
     public function ui()
     {
-        // set templates of Files UI and widgets
-        if ($this->rc->task != 'mail') {
-            return;
-        }
-
-        if ($this->rc->action && !in_array($this->rc->action, array('show', 'preview'))) {
+        if ($this->rc->action && !in_array($this->rc->action, array('show', 'preview', 'dialog-ui'))) {
             return;
         }
 
@@ -62,7 +57,7 @@ class kolab_tags_engine
         $this->rc->output->add_label('cancel', 'save');
         $this->plugin->add_label('tags', 'add', 'edit', 'delete', 'saving',
             'nameempty', 'nameexists', 'colorinvalid', 'untag', 'tagname',
-            'tagcolor', 'tagsearchnew', 'newtag');
+            'tagcolor', 'tagsearchnew', 'newtag', 'notags');
 
         $this->rc->output->add_handlers(array(
             'plugin.taglist' => array($this, 'taglist'),
@@ -71,8 +66,14 @@ class kolab_tags_engine
         $ui = $this->rc->output->parse('kolab_tags.ui', false, false);
         $this->rc->output->add_footer($ui);
 
-        // load miniColors
+        // load miniColors and tagedit
         jqueryui::miniColors();
+        jqueryui::tagedit();
+
+        // Modify search filter (and set selected tags)
+        if ($this->rc->task == 'mail' && ($this->rc->action == 'show' || !$this->rc->action)) {
+            $this->search_filter_mods();
+        }
     }
 
     /**
@@ -278,6 +279,18 @@ class kolab_tags_engine
         }
     }
 
+    /**
+     * Refresh tags list
+     */
+    public function action_refresh()
+    {
+        $taglist = $this->backend->list_tags();
+        $taglist = array_map(array($this, 'parse_tag'), $taglist);
+
+        $this->rc->output->set_env('tags', $taglist);
+        $this->rc->output->command('plugin.kolab_tags', array('refresh' => 1));
+    }
+
     /**
      * Template object building tags list/cloud
      */
@@ -347,7 +360,7 @@ class kolab_tags_engine
         $tags    = array();
 
         foreach ($taglist as $tag) {
-            $tag = $this->parse_tag($tag, true);
+            $tag = $this->parse_tag($tag, true, false);
             if (in_array($uid, (array)$tag['uids'][$folder])) {
                 unset($tag['uids']);
                 $tags[] = $tag;
@@ -443,10 +456,30 @@ class kolab_tags_engine
         return $args;
     }
 
+    /**
+     * Get selected tags when in search-mode
+     */
+    protected function search_filter_mods()
+    {
+       if (!empty($_REQUEST['_search']) && !empty($_SESSION['search'])
+            && $_SESSION['search_request'] == $_REQUEST['_search']
+            && ($filter = $_SESSION['search_filter'])
+       ) {
+            if (preg_match('/^(kolab_tags_[0-9]{10,}:([^:]+):)/', $filter, $m)) {
+                $search_tags   = explode(',', $m[2]);
+                $search_filter = substr($filter, strlen($m[1]));
+
+                // send current search properties to the browser
+                $this->rc->output->set_env('search_filter_selected', $search_filter);
+                $this->rc->output->set_env('selected_tags', $search_tags);
+            }
+        }
+    }
+
     /**
      * "Convert" tag object to simple array for use in javascript
      */
-    private function parse_tag($tag, $list = false)
+    private function parse_tag($tag, $list = false, $force = true)
     {
         $result = array(
             'uid'   => $tag['uid'],
@@ -455,7 +488,7 @@ class kolab_tags_engine
         );
 
         if ($list) {
-            $result['uids'] = $this->get_tag_messages($tag);
+            $result['uids'] = $this->get_tag_messages($tag, $force);
         }
 
         return $result;
diff --git a/plugins/kolab_tags/localization/bg.inc b/plugins/kolab_tags/localization/bg.inc
new file mode 100644
index 00000000..4d685b5b
--- /dev/null
+++ b/plugins/kolab_tags/localization/bg.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['tags'] = 'Етикети';
diff --git a/plugins/kolab_tags/localization/bg_BG.inc b/plugins/kolab_tags/localization/bg_BG.inc
index 4bcf6cec..2e1e8a5a 100644
--- a/plugins/kolab_tags/localization/bg_BG.inc
+++ b/plugins/kolab_tags/localization/bg_BG.inc
@@ -6,6 +6,8 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
+$labels['tags'] = 'Етикети';
+$labels['notags'] = 'No tags';
 $labels['edit'] = 'Промяна';
 $labels['delete'] = 'Delete';
 $labels['tagname'] = 'Име';
diff --git a/plugins/kolab_tags/localization/ca_ES.inc b/plugins/kolab_tags/localization/ca_ES.inc
index 34d26fa4..135accac 100644
--- a/plugins/kolab_tags/localization/ca_ES.inc
+++ b/plugins/kolab_tags/localization/ca_ES.inc
@@ -7,6 +7,7 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Etiquetes';
+$labels['notags'] = 'No tags';
 $labels['edit'] = 'Edita';
 $labels['delete'] = 'Suprimeix';
 $labels['tagname'] = 'Nom';
diff --git a/plugins/kolab_tags/localization/cs_CZ.inc b/plugins/kolab_tags/localization/cs_CZ.inc
index 74788da5..2f8a3cee 100644
--- a/plugins/kolab_tags/localization/cs_CZ.inc
+++ b/plugins/kolab_tags/localization/cs_CZ.inc
@@ -13,6 +13,7 @@ $labels['tagactions'] = 'Označit činnosti...';
 $labels['tagadd'] = 'Označit jako...';
 $labels['tagremove'] = 'Odstranit značku...';
 $labels['untag'] = 'Odstranit značku';
+$labels['notags'] = 'Žádné značky';
 $labels['tagremoveall'] = 'Odstranit všechny značky';
 $labels['add'] = 'Přidat';
 $labels['edit'] = 'Upravit';
@@ -29,3 +30,5 @@ $labels['taggingsuccess'] = 'Značky byly úspěšně přiřazeny.';
 $labels['taggingerror'] = 'Nepodařilo se přiřadit značky.';
 $labels['untaggingsuccess'] = 'Značka (značky) byly úspěšně odstraněny.';
 $labels['untaggingerror'] = 'Nepodařilo se odstranit přiřazení značek.';
+$labels['newtag'] = 'Nová značka';
+$labels['tagsearchnew'] = 'Zadejte text pro hledání nebo vytvoření nové značky';
diff --git a/plugins/kolab_tags/localization/da_DK.inc b/plugins/kolab_tags/localization/da_DK.inc
index 9102c44a..3af685e5 100644
--- a/plugins/kolab_tags/localization/da_DK.inc
+++ b/plugins/kolab_tags/localization/da_DK.inc
@@ -7,9 +7,26 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Mærker';
+$labels['unset'] = 'Fravælg alle';
+$labels['manage'] = 'Administrér mærker...';
+$labels['tagactions'] = 'Afmærk handlinger...';
+$labels['tagadd'] = 'Markér som...';
+$labels['tagremove'] = 'Fjern mærke...';
+$labels['untag'] = 'Fjern mærke';
+$labels['notags'] = 'Ingen mærker';
+$labels['tagremoveall'] = 'Fjern alle mærker';
 $labels['add'] = 'Tilføj';
 $labels['edit'] = 'Redigér';
 $labels['delete'] = 'Slet';
 $labels['tagname'] = 'Navn';
 $labels['tagcolor'] = 'Farve';
+$labels['nameempty'] = 'Navn på mærke må ikke stå tomt!';
+$labels['nameexists'] = 'Afmærkning med det angivne navn findes allerede!';
+$labels['colorinvalid'] = 'Ugyldig specifikation af farve!';
 $labels['saving'] = 'Gemmer data...';
+$labels['updatesuccess'] = 'Opdateringen af mærkerne er blevet gennemført.';
+$labels['updateerror'] = 'Mislykkedes med at opdatere information om mærker.';
+$labels['taggingsuccess'] = 'Tildelingen af mærkerne er blevet gennemført.';
+$labels['taggingerror'] = 'Mislykkedes med at tildele mærkerne.';
+$labels['untaggingsuccess'] = 'Fjernelse af mærke(r) er blevet gennemført.';
+$labels['untaggingerror'] = 'Mislykkedes med at fjerne tildelingen af mærkerne.';
diff --git a/plugins/kolab_tags/localization/de_CH.inc b/plugins/kolab_tags/localization/de_CH.inc
index 29011091..a56ec5ef 100644
--- a/plugins/kolab_tags/localization/de_CH.inc
+++ b/plugins/kolab_tags/localization/de_CH.inc
@@ -7,9 +7,28 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Tags';
+$labels['unset'] = 'Alle abwählen';
+$labels['manage'] = 'Schlagworte verwalten...';
+$labels['tagactions'] = 'Schlagwort Aktion...';
+$labels['tagadd'] = 'Vergebe Schlagwort...';
+$labels['tagremove'] = 'Entferne Schlagwort..';
+$labels['untag'] = 'Entferne Schlagwort';
+$labels['notags'] = 'Keine Schlagworte';
+$labels['tagremoveall'] = 'Entferne alle Schlagworte';
 $labels['add'] = 'Hinzufügen';
 $labels['edit'] = 'Bearbeiten';
 $labels['delete'] = 'Löschen';
 $labels['tagname'] = 'Name';
 $labels['tagcolor'] = 'Farbe';
+$labels['nameempty'] = 'Schlagwort kann nicht leer sein!';
+$labels['nameexists'] = 'Das Schlagwort existiert bereits';
+$labels['colorinvalid'] = 'Ungültige Farbangabe';
 $labels['saving'] = 'Speichere...';
+$labels['updatesuccess'] = 'Schlagworte wurden erfolgreich aktualisiert.';
+$labels['updateerror'] = 'Schlagworte konnten nicht aktualisiert werden.';
+$labels['taggingsuccess'] = 'Schlagwort wurde erfolgreich zugewiesen.';
+$labels['taggingerror'] = 'Konnte Schlagwort nicht zuweisen.';
+$labels['untaggingsuccess'] = 'Schlagwort(e) wurden erfolgreich entfernt.';
+$labels['untaggingerror'] = 'Schlagwort konnte nicht entfernt werden.';
+$labels['newtag'] = 'Neues Schlagwort';
+$labels['tagsearchnew'] = 'Text eingeben zur Suche oder für die Anlage eines neuen Schlagworts';
diff --git a/plugins/kolab_tags/localization/de_DE.inc b/plugins/kolab_tags/localization/de_DE.inc
index 0d78f862..2ee98449 100644
--- a/plugins/kolab_tags/localization/de_DE.inc
+++ b/plugins/kolab_tags/localization/de_DE.inc
@@ -13,6 +13,7 @@ $labels['tagactions'] = 'Schlagwort Aktion...';
 $labels['tagadd'] = 'Vergebe Schlagwort...';
 $labels['tagremove'] = 'Entferne Schlagwort..';
 $labels['untag'] = 'Entferne Schlagwort';
+$labels['notags'] = 'Keine Schlagworte';
 $labels['tagremoveall'] = 'Entferne alle Schlagworte';
 $labels['add'] = 'Hinzufügen';
 $labels['edit'] = 'Bearbeiten';
@@ -29,3 +30,5 @@ $labels['taggingsuccess'] = 'Schlagwort wurde erfolgreich zugewiesen.';
 $labels['taggingerror'] = 'Konnte Schlagwort nicht zuweisen.';
 $labels['untaggingsuccess'] = 'Schlagwort(e) wurden erfolgreich entfernt.';
 $labels['untaggingerror'] = 'Schlagwort konnte nicht entfernt werden.';
+$labels['newtag'] = 'Neues Schlagwort';
+$labels['tagsearchnew'] = 'Text eingeben zur Suche oder für die Anlage eines neuen Schlagworts';
diff --git a/plugins/kolab_tags/localization/el.inc b/plugins/kolab_tags/localization/el.inc
new file mode 100644
index 00000000..21544f01
--- /dev/null
+++ b/plugins/kolab_tags/localization/el.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['tags'] = 'Ετικέτες';
+$labels['unset'] = 'Αναίρεση επιλογής όλων';
+$labels['tagremove'] = 'Αφαίρεση ετικέτας...';
+$labels['untag'] = 'Αφαίρεση ετικέτας';
+$labels['notags'] = 'Καμία ετικέτα';
+$labels['add'] = 'Προσθήκη';
+$labels['edit'] = 'Επεξεργασία';
+$labels['delete'] = 'Διαγραφή';
+$labels['tagname'] = 'Όνομα';
+$labels['tagcolor'] = 'Χρώμα';
+$labels['saving'] = 'Αποθήκευση δεδομένων...';
diff --git a/plugins/kolab_tags/localization/en_US.inc b/plugins/kolab_tags/localization/en_US.inc
index 26b07248..4dab4012 100644
--- a/plugins/kolab_tags/localization/en_US.inc
+++ b/plugins/kolab_tags/localization/en_US.inc
@@ -15,6 +15,7 @@ $labels['tagactions'] = 'Tag actions...';
 $labels['tagadd'] = 'Tag as...';
 $labels['tagremove'] = 'Remove tag...';
 $labels['untag'] = 'Remove tag';
+$labels['notags'] = 'No tags';
 $labels['tagremoveall'] = 'Remove all tags';
 $labels['add'] = 'Add';
 $labels['edit'] = 'Edit';
diff --git a/plugins/kolab_tags/localization/es_AR.inc b/plugins/kolab_tags/localization/es_AR.inc
index ba361933..cd0edc96 100644
--- a/plugins/kolab_tags/localization/es_AR.inc
+++ b/plugins/kolab_tags/localization/es_AR.inc
@@ -13,6 +13,7 @@ $labels['tagactions'] = 'Acciones de etiquetas...';
 $labels['tagadd'] = 'Etiquetar como...';
 $labels['tagremove'] = 'Eliminar etiqueta...';
 $labels['untag'] = 'Eliminar etiqueta';
+$labels['notags'] = 'Sin etiquetas';
 $labels['tagremoveall'] = 'Eliminar todas las etiquetas';
 $labels['add'] = 'Agregar';
 $labels['edit'] = 'Editar';
@@ -29,3 +30,5 @@ $labels['taggingsuccess'] = 'Las etiquetas han sido asignadas exitosamente.';
 $labels['taggingerror'] = 'Fallo al asignar etiquetas.';
 $labels['untaggingsuccess'] = 'Una o más etiquetas han sido eliminadas exitosamente.';
 $labels['untaggingerror'] = 'Fallo al eliminar asignaciones de etiquetas.';
+$labels['newtag'] = 'Nueva etiqueta';
+$labels['tagsearchnew'] = 'Ingrese el texto a buscar o cree una nueva etiqueta';
diff --git a/plugins/kolab_tags/localization/es_ES.inc b/plugins/kolab_tags/localization/es_ES.inc
index 9074f59a..682d4a01 100644
--- a/plugins/kolab_tags/localization/es_ES.inc
+++ b/plugins/kolab_tags/localization/es_ES.inc
@@ -6,9 +6,29 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
+$labels['tags'] = 'Etiquetas';
+$labels['unset'] = 'Desmarcar todos';
+$labels['manage'] = 'Gestionar tareas...';
+$labels['tagactions'] = 'Etiquetar acciones...';
+$labels['tagadd'] = 'Etiquetar como...';
+$labels['tagremove'] = 'Eliminar etiqueta...';
+$labels['untag'] = 'Eliminar etiqueta';
+$labels['notags'] = 'Sin etiquetas';
+$labels['tagremoveall'] = 'Eliminar todas las etiquetas';
 $labels['add'] = 'Añadir';
 $labels['edit'] = 'Editar';
 $labels['delete'] = 'Borrar';
 $labels['tagname'] = 'Nombre';
 $labels['tagcolor'] = 'Color';
+$labels['nameempty'] = 'El nombre de la etiqueta no puede estar vacío';
+$labels['nameexists'] = 'Marcado con un nombre específicado que ya existe';
+$labels['colorinvalid'] = 'Especificación del color inválida';
 $labels['saving'] = 'Guardando datos...';
+$labels['updatesuccess'] = 'Se han actualizado las etiquetas con éxito.';
+$labels['updateerror'] = 'Error al actualizar la información de las etiquetas';
+$labels['taggingsuccess'] = 'Se han asignado las etiquetas con éxito.';
+$labels['taggingerror'] = 'Error al asignar los datos.';
+$labels['untaggingsuccess'] = 'Se han eliminado las etiquetas con éxito.';
+$labels['untaggingerror'] = 'No se pudieron eliminar las asignaciones de etiquetas';
+$labels['newtag'] = 'Etiqueta nueva';
+$labels['tagsearchnew'] = 'Introduzca un texto para buscar o crear una etiqueta nueva';
diff --git a/plugins/kolab_tags/localization/et_EE.inc b/plugins/kolab_tags/localization/et_EE.inc
index 708abdf4..bf9f4f45 100644
--- a/plugins/kolab_tags/localization/et_EE.inc
+++ b/plugins/kolab_tags/localization/et_EE.inc
@@ -6,6 +6,29 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
+$labels['tags'] = 'Sildid';
+$labels['unset'] = 'Eemalda kõigi valik';
+$labels['manage'] = 'Siltide haldamine...';
+$labels['tagactions'] = 'Siltide toimingud...';
+$labels['tagadd'] = 'Sildista...';
+$labels['tagremove'] = 'Eemalda silt...';
+$labels['untag'] = 'Eemalda silt';
+$labels['notags'] = 'Silte pole';
+$labels['tagremoveall'] = 'Eemalda kõik sildid';
 $labels['add'] = 'Lisa';
+$labels['edit'] = 'Muuda';
 $labels['delete'] = 'Kustuta';
 $labels['tagname'] = 'Nimi';
+$labels['tagcolor'] = 'Värv';
+$labels['nameempty'] = 'Sildi nimi ei saa olle tühi!';
+$labels['nameexists'] = 'Selle nimega silt on juba olemas!';
+$labels['colorinvalid'] = 'Vigane värv!';
+$labels['saving'] = 'Andmete salvestamine...';
+$labels['updatesuccess'] = 'Silte on uuendatud.';
+$labels['updateerror'] = 'Silteide info uuendamine ebaõnnestus.';
+$labels['taggingsuccess'] = 'Sildid on määratud.';
+$labels['taggingerror'] = 'Siltide määramine ebaõnnestus.';
+$labels['untaggingsuccess'] = 'Silt (sildid) on eemaldatud.';
+$labels['untaggingerror'] = 'Siltide eemaldamine ebaõnnestus.';
+$labels['newtag'] = 'Uus silt';
+$labels['tagsearchnew'] = 'Sisesta otsitav tekst või lisa uue silt';
diff --git a/plugins/kolab_tags/localization/fi_FI.inc b/plugins/kolab_tags/localization/fi_FI.inc
index 716041b9..1850abaa 100644
--- a/plugins/kolab_tags/localization/fi_FI.inc
+++ b/plugins/kolab_tags/localization/fi_FI.inc
@@ -13,6 +13,7 @@ $labels['tagactions'] = 'Tunnistetoiminnot...';
 $labels['tagadd'] = 'Merkitse tunnisteella...';
 $labels['tagremove'] = 'Poista tunniste...';
 $labels['untag'] = 'Poista tunniste';
+$labels['notags'] = 'Ei tunnisteita';
 $labels['tagremoveall'] = 'Poista kaikki tunnisteet';
 $labels['add'] = 'Lisää';
 $labels['edit'] = 'Muokkaa';
@@ -28,3 +29,6 @@ $labels['updateerror'] = 'Tunnistetietojen päivittäminen epäonnistui.';
 $labels['taggingsuccess'] = 'Tunnisteet on asetettu onnistuneesti.';
 $labels['taggingerror'] = 'Tunnisteiden asettaminen epäonnistui.';
 $labels['untaggingsuccess'] = 'Tunnisteet on poistettu onnistuneesti.';
+$labels['untaggingerror'] = 'Tunnisteiden asettamisen poistaminen epäonnistui.';
+$labels['newtag'] = 'Uusi tunniste';
+$labels['tagsearchnew'] = 'Kirjoita haettava teksti tai luo uusi tunniste';
diff --git a/plugins/kolab_tags/localization/fr_FR.inc b/plugins/kolab_tags/localization/fr_FR.inc
index 59ef0aaa..a9024c02 100644
--- a/plugins/kolab_tags/localization/fr_FR.inc
+++ b/plugins/kolab_tags/localization/fr_FR.inc
@@ -7,12 +7,13 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Étiquettes';
-$labels['unset'] = 'Tout déselectionner';
+$labels['unset'] = 'Tout désélectionner';
 $labels['manage'] = 'Gestion des étiquettes...';
 $labels['tagactions'] = 'Actions étiquette...';
-$labels['tagadd'] = 'Étiquette comme...';
-$labels['tagremove'] = 'Étiqueter comme...';
+$labels['tagadd'] = 'Étiqueter en tant que...';
+$labels['tagremove'] = 'Supprimer l\'étiquette...';
 $labels['untag'] = 'Supprimer l\'étiquette';
+$labels['notags'] = 'Pas d\'étiquette';
 $labels['tagremoveall'] = 'Supprimer toutes les étiquettes';
 $labels['add'] = 'Ajouter';
 $labels['edit'] = 'Modifier';
@@ -29,3 +30,5 @@ $labels['taggingsuccess'] = 'Les étiquettes ont été affectées avec succès.'
 $labels['taggingerror'] = 'Impossible d\'affecter les étiquettes.';
 $labels['untaggingsuccess'] = 'Étiquette(s) supprimée(s) avec succès.';
 $labels['untaggingerror'] = 'Impossible de supprimer les affectations.';
+$labels['newtag'] = 'Nouvelle balise';
+$labels['tagsearchnew'] = 'Entrez votre texte afin de chercher ou créez une nouvelle balise';
diff --git a/plugins/kolab_tags/localization/hu_HU.inc b/plugins/kolab_tags/localization/hu_HU.inc
index 685f185c..1d2f9da7 100644
--- a/plugins/kolab_tags/localization/hu_HU.inc
+++ b/plugins/kolab_tags/localization/hu_HU.inc
@@ -7,6 +7,7 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Kulcsszavak';
+$labels['notags'] = 'No tags';
 $labels['edit'] = 'Módosítás';
 $labels['tagname'] = 'Név';
 $labels['tagcolor'] = 'Szín';
diff --git a/plugins/kolab_tags/localization/ja_JP.inc b/plugins/kolab_tags/localization/ja_JP.inc
index d73a5bec..6263594b 100644
--- a/plugins/kolab_tags/localization/ja_JP.inc
+++ b/plugins/kolab_tags/localization/ja_JP.inc
@@ -7,9 +7,26 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'タグ';
+$labels['unset'] = '全選択解除';
+$labels['manage'] = 'タグの管理';
+$labels['tagactions'] = 'タグの動作…';
+$labels['tagadd'] = 'タグの種類';
+$labels['tagremove'] = 'タグの削除…';
+$labels['untag'] = 'タグを削除';
+$labels['notags'] = 'タグなし';
+$labels['tagremoveall'] = '全タグの削除';
 $labels['add'] = '追加';
 $labels['edit'] = '編集';
 $labels['delete'] = '削除';
 $labels['tagname'] = '名前';
 $labels['tagcolor'] = '色';
+$labels['nameempty'] = 'タグには必ず名前が必要です!';
+$labels['nameexists'] = '指定された名前のタグはすでにあります!';
+$labels['colorinvalid'] = '無効な色の指定です!';
 $labels['saving'] = 'データを保存中…';
+$labels['updatesuccess'] = 'タグの更新に成功しました。';
+$labels['updateerror'] = 'タグ情報の更新に失敗しました。';
+$labels['taggingsuccess'] = 'タグの割当に成功しました。';
+$labels['taggingerror'] = 'タグの割当に失敗しました。';
+$labels['untaggingsuccess'] = 'タグ(s)の削除に成功しました。';
+$labels['untaggingerror'] = 'タグ割当の削除に失敗しました。';
diff --git a/plugins/kolab_tags/localization/ko_KR.inc b/plugins/kolab_tags/localization/ko_KR.inc
new file mode 100644
index 00000000..dcbd547e
--- /dev/null
+++ b/plugins/kolab_tags/localization/ko_KR.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['edit'] = '수정';
+$labels['tagname'] = '이름';
+$labels['tagcolor'] = '색상';
+$labels['saving'] = '자료 저장중...';
diff --git a/plugins/kolab_tags/localization/lv.inc b/plugins/kolab_tags/localization/lv.inc
new file mode 100644
index 00000000..c723ee3e
--- /dev/null
+++ b/plugins/kolab_tags/localization/lv.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['edit'] = 'Labot';
+$labels['tagname'] = 'Nosaukums';
+$labels['tagcolor'] = 'Krāsa';
+$labels['saving'] = 'Saglabājam...';
diff --git a/plugins/kolab_tags/localization/nl_NL.inc b/plugins/kolab_tags/localization/nl_NL.inc
index 209864a6..0dd77631 100644
--- a/plugins/kolab_tags/localization/nl_NL.inc
+++ b/plugins/kolab_tags/localization/nl_NL.inc
@@ -6,10 +6,29 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
-$labels['tags'] = 'Labels';
+$labels['tags'] = 'Tags';
+$labels['unset'] = 'Alle selecties opheffen';
+$labels['manage'] = 'Tags beheren...';
+$labels['tagactions'] = 'Tagacties...';
+$labels['tagadd'] = 'Taggen als...';
+$labels['tagremove'] = 'Tag verwijderen...';
+$labels['untag'] = 'Tag verwijderen';
+$labels['notags'] = 'Geen tags';
+$labels['tagremoveall'] = 'Alle tags verwijderen';
 $labels['add'] = 'Toevoegen';
-$labels['edit'] = 'Wijzig';
+$labels['edit'] = 'Bewerken';
 $labels['delete'] = 'Verwijderen';
 $labels['tagname'] = 'Naam';
 $labels['tagcolor'] = 'Kleur';
-$labels['saving'] = 'Data wordt opgeslagen...';
+$labels['nameempty'] = 'Tagnaam mag niet leeg zijn!';
+$labels['nameexists'] = 'Tag met opgegeven naam bestaat al!';
+$labels['colorinvalid'] = 'Ongeldige kleurspecificatie!';
+$labels['saving'] = 'Gegevens opslaan...';
+$labels['updatesuccess'] = 'Tags zijn met succes bijgewerkt.';
+$labels['updateerror'] = 'Bijwerken van taginformatie is mislukt.';
+$labels['taggingsuccess'] = 'Tags zijn met succes toegewezen.';
+$labels['taggingerror'] = 'Toewijzen van tags is mislukt.';
+$labels['untaggingsuccess'] = 'Tag(s) met succes verwijderd.';
+$labels['untaggingerror'] = 'Verwijderen van toegewezen tags is mislukt.';
+$labels['newtag'] = 'Nieuwe tag';
+$labels['tagsearchnew'] = 'Voer tekst in die u wilt zoeken of maak een nieuwe tag';
diff --git a/plugins/kolab_tags/localization/pl_PL.inc b/plugins/kolab_tags/localization/pl_PL.inc
index 39e297f2..55f4f57a 100644
--- a/plugins/kolab_tags/localization/pl_PL.inc
+++ b/plugins/kolab_tags/localization/pl_PL.inc
@@ -7,25 +7,8 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Tagi';
-$labels['unset'] = 'Odznacz wszystkie';
-$labels['manage'] = 'Zarządzaj tagami...';
-$labels['tagactions'] = 'Akcje tagów...';
-$labels['tagadd'] = 'Otaguj jako...';
-$labels['tagremove'] = 'Usuń tag...';
-$labels['untag'] = 'Usuń tag';
-$labels['tagremoveall'] = 'Usuń wszystkie tagi';
-$labels['add'] = 'Dodaj';
 $labels['edit'] = 'Edytuj';
 $labels['delete'] = 'Usuń';
 $labels['tagname'] = 'Nazwa';
 $labels['tagcolor'] = 'Kolor';
-$labels['nameempty'] = 'Nazwa tagu jest wymagana!';
-$labels['nameexists'] = 'Tag o podanej nazwie już istnieje!';
-$labels['colorinvalid'] = 'Błędny format koloru!';
 $labels['saving'] = 'Zapisuję dane...';
-$labels['updatesuccess'] = 'Tagi zostały zaktualizowane pomyślnie.';
-$labels['updateerror'] = 'Błąd podczas zapisu danych tagów.';
-$labels['taggingsuccess'] = 'Tagi zostały przypisane pomyślnie.';
-$labels['taggingerror'] = 'Błąd podczas przypisywania tagów.';
-$labels['untaggingsuccess'] = 'Tagi zostały usunięte pomyślnie.';
-$labels['untaggingerror'] = 'Błąd podczas usuwania powiązań z tagami.';
diff --git a/plugins/kolab_tags/localization/pt_BR.inc b/plugins/kolab_tags/localization/pt_BR.inc
index d9cf0aeb..eaf903a0 100644
--- a/plugins/kolab_tags/localization/pt_BR.inc
+++ b/plugins/kolab_tags/localization/pt_BR.inc
@@ -7,6 +7,7 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Etiquetas';
+$labels['notags'] = 'No tags';
 $labels['add'] = 'Adicionar';
 $labels['edit'] = 'Editar';
 $labels['delete'] = 'Deletar';
diff --git a/plugins/kolab_tags/localization/ru_RU.inc b/plugins/kolab_tags/localization/ru_RU.inc
index 340bde86..524259c0 100644
--- a/plugins/kolab_tags/localization/ru_RU.inc
+++ b/plugins/kolab_tags/localization/ru_RU.inc
@@ -13,6 +13,7 @@ $labels['tagactions'] = 'Действия с тегами...';
 $labels['tagadd'] = 'Назначить тег...';
 $labels['tagremove'] = 'Снять тег...';
 $labels['untag'] = 'Удалить тег';
+$labels['notags'] = 'Нет тегов';
 $labels['tagremoveall'] = 'Удалить все теги';
 $labels['add'] = 'Добавить';
 $labels['edit'] = 'Редактировать';
@@ -29,3 +30,5 @@ $labels['taggingsuccess'] = 'Теги успешно назначены.';
 $labels['taggingerror'] = 'Не удалось назначить теги.';
 $labels['untaggingsuccess'] = 'Тег(и) успешно убраны.';
 $labels['untaggingerror'] = 'Не удалось снять назначенные теги.';
+$labels['newtag'] = 'Новый тег';
+$labels['tagsearchnew'] = 'Введите текст для поиска или создания тега';
diff --git a/plugins/kolab_tags/localization/sk_SK.inc b/plugins/kolab_tags/localization/sk_SK.inc
new file mode 100644
index 00000000..ef8711bd
--- /dev/null
+++ b/plugins/kolab_tags/localization/sk_SK.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['edit'] = 'Upraviť';
+$labels['tagname'] = 'Meno';
+$labels['tagcolor'] = 'Farba';
diff --git a/plugins/kolab_tags/localization/sl_SI.inc b/plugins/kolab_tags/localization/sl_SI.inc
new file mode 100644
index 00000000..18036ad8
--- /dev/null
+++ b/plugins/kolab_tags/localization/sl_SI.inc
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['tags'] = 'Tagi';
+$labels['unset'] = 'Odznači vse';
+$labels['manage'] = 'Uredi tage...';
+$labels['tagactions'] = 'Možnosti taga...';
+$labels['tagadd'] = 'Označi kot tag...';
+$labels['tagremove'] = 'Odstrani tag...';
+$labels['untag'] = 'Odstrani tag';
+$labels['notags'] = 'Ni tagov';
+$labels['tagremoveall'] = 'Odstrani vse tage';
+$labels['add'] = 'Dodaj';
+$labels['edit'] = 'Uredi';
+$labels['delete'] = 'Izbriši';
+$labels['tagname'] = 'Ime';
+$labels['tagcolor'] = 'Barva';
+$labels['nameempty'] = 'Ime taga ne more biti prazno!';
+$labels['nameexists'] = 'Tag z izbranim imenom že obstaja!';
+$labels['colorinvalid'] = 'Napačna izbira barve!';
+$labels['saving'] = 'Shranjujem...';
+$labels['updatesuccess'] = 'Tagi so bili uspešno posodobljeni.';
+$labels['updateerror'] = 'Napaka. Posodabljanje tagov ni uspelo.';
+$labels['taggingsuccess'] = 'Tagi so bili uspešno dodeljeni.';
+$labels['taggingerror'] = 'Napaka. Tagi niso bili dodeljeni.';
+$labels['untaggingsuccess'] = 'Tag(i) so bili uspešno odstranjeni.';
+$labels['untaggingerror'] = 'Napaka. Tagi nalog niso bili odstranjeni.';
diff --git a/plugins/kolab_tags/localization/sv_SE.inc b/plugins/kolab_tags/localization/sv_SE.inc
index 79abf98a..38e3f418 100644
--- a/plugins/kolab_tags/localization/sv_SE.inc
+++ b/plugins/kolab_tags/localization/sv_SE.inc
@@ -6,26 +6,10 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
-$labels['tags'] = 'Etiketter';
-$labels['unset'] = 'Avmarkera alla';
-$labels['manage'] = 'Hantera etiketter ...';
-$labels['tagactions'] = 'Åtgärder för etiketter ...';
-$labels['tagadd'] = 'Etikettera som ...';
-$labels['tagremove'] = 'Ta bort etikett ...';
-$labels['untag'] = 'Ta bort etikett';
-$labels['tagremoveall'] = 'Ta bort alla etiketter';
-$labels['add'] = 'Lägg till';
+$labels['tags'] = 'Taggar';
+$labels['untag'] = 'Ta bort tagg';
+$labels['notags'] = 'Inga taggar';
 $labels['edit'] = 'Redigera';
-$labels['delete'] = 'Ta bort';
 $labels['tagname'] = 'Namn';
 $labels['tagcolor'] = 'Färg';
-$labels['nameempty'] = 'Etikettens namn kan inte vara tomt!';
-$labels['nameexists'] = 'Etikett med angivet namn finns redan!';
-$labels['colorinvalid'] = 'Ogiltig färgspecifikation!';
 $labels['saving'] = 'Sparar data ...';
-$labels['updatesuccess'] = 'Etiketter har uppdaterats.';
-$labels['updateerror'] = 'Misslyckades att uppdatera etikettinformation.';
-$labels['taggingsuccess'] = 'Etiketter har blivit tilldelade.';
-$labels['taggingerror'] = 'Misslyckades att tilldela etiketter.';
-$labels['untaggingsuccess'] = 'Etikett(er) har tagits bort.';
-$labels['untaggingerror'] = 'Misslyckades att ta bort etikettilldelningar.';
diff --git a/plugins/kolab_tags/localization/th_TH.inc b/plugins/kolab_tags/localization/th_TH.inc
new file mode 100644
index 00000000..80e35ef1
--- /dev/null
+++ b/plugins/kolab_tags/localization/th_TH.inc
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['tags'] = 'แท็ก';
+$labels['unset'] = 'ยกเลิกการเลือกทั้งหมด';
+$labels['manage'] = 'จัดการ แท็ก...';
+$labels['tagremove'] = 'ยกเลิก แท็ก...';
+$labels['untag'] = 'ยกเลิกแท็ก';
+$labels['tagremoveall'] = 'ยกเลิกแท็กทั้งหมด';
+$labels['add'] = 'เพิ่ม';
+$labels['edit'] = 'แก้ไข';
+$labels['delete'] = 'ลบ';
+$labels['tagname'] = 'ชื่อ';
+$labels['tagcolor'] = 'สี';
+$labels['nameempty'] = 'ชื่อของแท็กต้องไม่ว่างเปล่า';
+$labels['nameexists'] = 'แท็กชื่อนี้มีอยู่แล้ว';
+$labels['colorinvalid'] = 'ข้อมูลสีไม่ถูกต้อง';
+$labels['saving'] = 'กำลังจัดเก็บข้อมูล...';
+$labels['updatesuccess'] = 'แท็กถูกปรับปรุงเรียบร้อยแล้ว';
+$labels['updateerror'] = 'การปรับปรุงข้อมูลแท็กล้มเหลว';
+$labels['taggingsuccess'] = 'การติดตั้งแท็กเรียบร้อยแล้ว';
+$labels['taggingerror'] = 'การติดตั้งแท็กล้มเหลว';
+$labels['untaggingsuccess'] = 'แท็กถูกลบเรียบร้อยแล้ว';
diff --git a/plugins/kolab_tags/localization/uk_UA.inc b/plugins/kolab_tags/localization/uk_UA.inc
new file mode 100644
index 00000000..3c4042b2
--- /dev/null
+++ b/plugins/kolab_tags/localization/uk_UA.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['edit'] = 'Редагувати';
+$labels['tagname'] = 'Назва';
+$labels['tagcolor'] = 'Колір';
+$labels['saving'] = 'Збереження даних...';
diff --git a/plugins/kolab_tags/localization/zh_CN.inc b/plugins/kolab_tags/localization/zh_CN.inc
index 414b778e..48b5b066 100644
--- a/plugins/kolab_tags/localization/zh_CN.inc
+++ b/plugins/kolab_tags/localization/zh_CN.inc
@@ -8,7 +8,9 @@
  */
 $labels['tags'] = '标签';
 $labels['untag'] = '移除标签';
+$labels['notags'] = '无标签';
 $labels['edit'] = '编辑';
+$labels['delete'] = '删除';
 $labels['tagname'] = '名称';
 $labels['tagcolor'] = '颜色';
 $labels['saving'] = '保存数据...';
diff --git a/plugins/kolab_tags/localization/zh_TW.inc b/plugins/kolab_tags/localization/zh_TW.inc
new file mode 100644
index 00000000..3d5166b8
--- /dev/null
+++ b/plugins/kolab_tags/localization/zh_TW.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['edit'] = 'Edit';
+$labels['tagname'] = 'Name';
+$labels['tagcolor'] = 'Color';
+$labels['saving'] = 'Saving data...';
diff --git a/plugins/kolab_tags/skins/elastic/templates/ui.html b/plugins/kolab_tags/skins/elastic/templates/ui.html
new file mode 100644
index 00000000..996bc6ac
--- /dev/null
+++ b/plugins/kolab_tags/skins/elastic/templates/ui.html
@@ -0,0 +1,67 @@
+<div id="tagcloud" style="display:none">
+	<h2 class="voice"><roundcube:label name="kolab_tags.tags" id="taglist" /></h2>
+	<div class="scroller withfooter">
+		<roundcube:object name="plugin.taglist" id="taglist" class="listing" />
+	</div>
+</div>
+
+<div id="tagsmenu" class="popupmenu" aria-hidden="true">
+	<ul class="toolbarmenu iconized">
+		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
+		<roundcube:button type="link-menuitem" command="reset-tags" label="kolab_tags.unset" class="tags reset disabled" classAct="tags reset active" />
+		<roundcube:button type="link-menuitem" command="manage-tags" label="kolab_tags.manage" class="tags disabled" classAct="tags active" />
+		<roundcube:container name="tagoptions" id="tagoptionsmenu" />
+	</ul>
+</div>
+
+<div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
+	<ul class="toolbarmenu iconized">
+		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
+		<roundcube:button type="link-menuitem" command="tag-add" label="kolab_tags.tagadd" classAct="tag add active" class="tag add disabled" />
+		<roundcube:button type="link-menuitem" command="tag-remove" label="kolab_tags.tagremove" classAct="tag remove active" class="tag remove disabled" />
+		<roundcube:button type="link-menuitem" command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="tag remove all active" class="tag remove all disabled" />
+	</ul>
+</div>
+
+<script>
+
+$(document).ready(function(e) {
+    // put tags cloud under folders list
+    var tagcloud = $('#tagcloud').detach();
+    $('#folderlist-content,#notebooks-content,#tasklists-content').children('ul:first').after(tagcloud.show());
+
+    // add tag message menu positions to Mark menu
+    var menu = $('#tagmessagemenu li').detach();
+    $('#markmessage-menu ul').append(menu);
+
+    // add tags management menu positions to folder actions menu
+    menu = $('#tagsmenu li').detach();
+    $('#mailboxoptions-menu,#notebookactions-menu,#tasklistactions-menu').find('ul').append(menu);
+
+    // Apply tags colors in Elastic-way
+    rcmail.addEventListener('kolab-tags-update', function() {
+        var style = '';
+
+        $.each(rcmail.env.tags || {}, function() {
+            if (this.color) {
+                var uid = this.uid.replace(/[^a-z0-9]/ig, '');
+                style += '.kolab-tag-' + uid + '::before {color: ' + this.color + ' !important}\n';
+            }
+        });
+
+        $('#kolab-tags-style').remove();
+
+        if (style) {
+            $('<style>').attr('id', 'kolab-tags-style').text(style).appendTo('head');
+        }
+    });
+
+    // Ignore tags coloring on lists, handled above, use default method for tagboxes only
+    rcmail.addEventListener('kolab-tag-color', function(prop) {
+        if ($(prop.obj).is('li:not(.tagedit-listelement)')) {
+            return false;
+        }
+    });
+});
+
+</script>
diff --git a/plugins/kolab_tags/skins/larry/style.css b/plugins/kolab_tags/skins/larry/style.css
index eabfea82..8edcfef7 100644
--- a/plugins/kolab_tags/skins/larry/style.css
+++ b/plugins/kolab_tags/skins/larry/style.css
@@ -70,6 +70,7 @@ ul.toolbarmenu li span.icon.tagremoveall {
 }
 
 .tag-draghelper .tag .count,
+#taglist li .count:empty,
 #taglist li.inactive .count {
 	display: none;
 }
@@ -87,9 +88,10 @@ ul.toolbarmenu li span.icon.tagremoveall {
 	margin-left: 10px;
 }
 
-#tagsform div.buttons input {
+#tagsform div.buttons button {
 	display: block;
 	width: 80px;
+	margin-bottom: 5px;
 }
 
 #tagsform select {
@@ -97,6 +99,10 @@ ul.toolbarmenu li span.icon.tagremoveall {
 	float: left;
 }
 
+#tageditform div.col-sm-10 {
+	display: inline-block;
+}
+
 #tageditform input {
 	margin-bottom: 5px;
 }
@@ -133,3 +139,86 @@ ul.toolbarmenu li span.icon.tagremoveall {
 #tag-selector li.search input {
 	width: 120px;
 }
+
+.tagline {
+	color: #999;
+	font-weight: normal;
+	font-size: 0.9em;
+	position: relative;
+	cursor: text;
+	margin: 4px 0 0 0;
+	min-height: 31px;
+}
+
+.tagline.disabled {
+	margin-top: 0;
+}
+
+.tagline .tagedit-list {
+	min-height: 31px;
+}
+
+.tagline.disabled .tagedit-list {
+	outline: none;
+	padding-left: 0;
+	border: 0;
+	min-height: 31px;
+	background: rgba(255,255,255,0.01);
+	-webkit-box-shadow: none;
+	   -moz-box-shadow: none;
+	     -o-box-shadow: none;
+	        box-shadow: none;
+}
+
+.tagline .placeholder {
+	position: absolute;
+	top: 6px;
+	left: 6px;
+	z-index: 2;
+}
+
+.tagline.disabled .placeholder {
+	left: 0;
+}
+
+.tagedit-list {
+	position: relative;
+	z-index: 1;
+	min-height: 32px;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	    -ms-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+
+.tagedit-list #tagedit-input {
+	background: none;
+}
+
+.tag-draghelper {
+	z-index: 1000;
+}
+
+.tagedit span.tag-element,
+.tagedit-list li.tagedit-listelement-old {
+	background: #ddeef5 !important;
+	border: 0 !important;
+	padding: 2px 20px 0 6px !important;
+	line-height: 1.5 !important;
+	position: relative !important;
+}
+
+.tagedit-list li.tagedit-listelement-old a.tagedit-close,
+.tagedit-list li.tagedit-listelement-old a.tagedit-break,
+.tagedit-list li.tagedit-listelement-old a.tagedit-delete,
+.tagedit-list li.tagedit-listelement-old a.tagedit-save {
+	position: absolute !important;
+	top: 1px !important;
+	right: 0;
+	background: transparent !important;
+	text-indent: initial !important;
+}
+
+.tag-droppable.ui-droppable-hover {
+	background-color: #e8e798;
+}
\ No newline at end of file
diff --git a/plugins/kolab_tags/skins/larry/templates/ui.html b/plugins/kolab_tags/skins/larry/templates/ui.html
index 1df50730..b4606f2a 100644
--- a/plugins/kolab_tags/skins/larry/templates/ui.html
+++ b/plugins/kolab_tags/skins/larry/templates/ui.html
@@ -20,22 +20,40 @@
 <div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
 	<ul class="toolbarmenu iconized">
 		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
-		<li role="menuitem"><roundcube:button command="tag-add" label="kolab_tags.tagadd" classAct="icon active" class="icon" innerclass="icon tagadd folder-selector-link" /></li>
-		<li role="menuitem"><roundcube:button command="tag-remove" label="kolab_tags.tagremove" classAct="icon active" class="icon" innerclass="icon tagremove folder-selector-link" /></li>
-		<li role="menuitem"><roundcube:button command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="icon active" class="icon" innerclass="icon tagremoveall" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="tag-add" label="kolab_tags.tagadd" classAct="icon active" class="icon" innerclass="icon tagadd folder-selector-link" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="tag-remove" label="kolab_tags.tagremove" classAct="icon active" class="icon" innerclass="icon tagremove folder-selector-link" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="icon active" class="icon" innerclass="icon tagremoveall" /></li>
 	</ul>
 </div>
 
-
 <script type="text/javascript">
 
 $(document).ready(function(e) {
     // put tags cloud under folders list
-    var tagcloud = $('#tagcloud').detach();
-    $('#mailview-left').append(tagcloud.show());
+    var containers, tagcloud = $('#tagcloud').detach();
 
-    new rcube_splitter({ id:'mailtagsplitter', p1:'#mailboxcontainer', p2:'#tagcloud',
-        orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+    if (rcmail.env.task == 'mail')
+        containers = {
+            sidebar: '#mailview-left',
+            list: '#mailboxcontainer'
+        };
+    else if (rcmail.env.task == 'notes')
+        containers = {
+            sidebar: '#sidebar',
+            list: '#notebooksbox'
+        };
+    else if (rcmail.env.task == 'tasks')
+        containers = {
+            sidebar: '#sidebar',
+            list: '#tasklistsbox'
+        };
+
+    if (containers) {
+        $(containers.sidebar).append(tagcloud.show());
+
+        new rcube_splitter({ id: rcmail.task + 'tagsplitter', p1:containers.list, p2:'#tagcloud',
+            orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+    }
 
     // add tag message menu positions to Mark menu
     var menu = $('#tagmessagemenu li').detach();
diff --git a/plugins/kolab_zpush/README b/plugins/kolab_zpush/README
deleted file mode 100644
index ccd513ae..00000000
--- a/plugins/kolab_zpush/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Icons by Fugue Icons <http://p.yusukekamiyamane.com/>
-
-Copyright (C) 2010 Yusuke Kamiyamane. All rights reserved.
-The icons are licensed under a Creative Commons Attribution
-3.0 license. <http://creativecommons.org/licenses/by/3.0/>
diff --git a/plugins/kolab_zpush/kolab_zpush.js b/plugins/kolab_zpush/kolab_zpush.js
deleted file mode 100644
index 599911a8..00000000
--- a/plugins/kolab_zpush/kolab_zpush.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Client scripts for the Kolab Z-Push configuration utitlity
- *
- * @version 0.2
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-function kolab_zpush_config()
-{
-    /* private members */
-    var me = this;
-    var http_lock = null;
-    var active_device = null;
-
-
-    /* constructor */
-    var devicelist = new rcube_list_widget(rcmail.gui_objects.devicelist,
-        { multiselect:true, draggable:false, keyboard:true });
-    devicelist.addEventListener('select', select_device);
-    devicelist.init();
-    
-    rcmail.register_command('plugin.save-config', save_config);
-    rcmail.register_command('plugin.delete-device', delete_device_config);
-    rcmail.addEventListener('plugin.zpush_data_ready', device_data_ready);
-    rcmail.addEventListener('plugin.zpush_save_complete', save_complete);
-
-    $('input.alarm').change(function(e){ if (this.checked) $('#'+this.id.replace(/_alarm/, '')).prop('checked', this.checked); });
-    $('input.subscription').change(function(e){ if (!this.checked) $('#'+this.id+'_alarm').prop('checked', false); });
-    $(window).bind('resize', resize_ui);
-
-    $('.subscriptionblock thead td.subscription img, .subscriptionblock thead td.alarm img').click(function(e){
-      var $this = $(this);
-      var classname = $this.parent().get(0).className;
-      var check = !($this.data('checked') || false);
-      $this.css('cursor', 'pointer').data('checked', check)
-        .closest('table').find('input.'+classname).prop('checked', check).change();
-    });
-
-    // select the one and only device from list
-    if (rcmail.env.devicecount == 1) {
-        for (var imei in rcmail.env.devices)
-            break;
-        devicelist.select(imei);
-    }
-
-    /* private methods */
-    function select_device(list)
-    {
-        active_device = list.get_single_selection();
-        rcmail.enable_command('plugin.save-config', 'plugin.delete-device', true);
-        
-        if (active_device) {
-            http_lock = rcmail.set_busy(true, 'loading');
-            rcmail.http_request('plugin.zpushjson', { cmd:'load', id:active_device }, http_lock);
-        }
-        
-        $('#introtext').hide();
-    }
-
-    // callback from server after loading device data
-    function device_data_ready(data)
-    {
-        // reset form first
-        $('input.alarm:checked').prop('checked', false);
-        $('input.subscription:checked').prop('checked', false).change();
-        
-        if (data.id && data.id == active_device) {
-            $('#config-device-alias').val(data.devicealias);
-            $('#config-device-mode').val(data.syncmode);
-            $('#config-device-laxpic').prop('checked', data.laxpic ? true : false);
-            
-            $('input.subscription').each(function(i, elem){
-                var key = elem.value;
-                elem.checked = data.subscribed[key] ? true : false;
-            }).change();
-            $('input.alarm').each(function(i, elem){
-                var key = elem.value;
-                elem.checked = data.subscribed[key] == 2;
-            });
-            
-            $('#configform, #prefs-box .boxtitle').show();
-            resize_ui();
-        }
-        else {
-            $('#configform, #prefs-box .boxtitle').hide();
-        }
-    }
-
-    // submit current configuration form to server
-    function save_config()
-    {
-        // TODO: validate device info
-        var data = {
-            cmd: 'save',
-            id: active_device,
-            devicealias: $('#config-device-alias').val(),
-            syncmode: $('#config-device-mode option:selected').val(),
-            laxpic: $('#config-device-laxpic').get(0).checked ? 1 : 0
-        };
-
-        data.subscribed = {};
-        $('input.subscription:checked').each(function(i, elem){
-            data.subscribed[elem.value] = 1;
-        });
-        $('input.alarm:checked').each(function(i, elem){
-            if (data.subscribed[elem.value])
-                data.subscribed[elem.value] = 2;
-        });
-
-        http_lock = rcmail.set_busy(true, 'kolab_zpush.savingdata');
-        rcmail.http_post('plugin.zpushjson', data, http_lock);
-    }
-
-    // callback function when saving has completed
-    function save_complete(p)
-    {
-        if (p.success && p.devicealias) {
-            $('#devices-table tr.selected span.devicealias').html(p.devicealias);
-            rcmail.env.devices[p.id].ALIAS = p.devicealias;
-        }
-    }
-    
-    // handler for delete commands
-    function delete_device_config()
-    {
-        if (active_device && confirm(rcmail.gettext('devicedeleteconfirm', 'kolab_zpush'))) {
-            http_lock = rcmail.set_busy(true, 'kolab_zpush.savingdata');
-            rcmail.http_post('plugin.zpushjson', { cmd:'delete', id:active_device }, http_lock);
-        }
-    }
-
-    // handler for window resize events: sets max-height of folders list scroll container
-    function resize_ui()
-    {
-        if (active_device) {
-            var h = $(window).height();
-            var pos = $('#foldersubscriptions').offset();
-            $('#foldersubscriptions').css('max-height', (h - pos.top - 90) + 'px');
-        }
-    }
-}
-
-
-window.rcmail && rcmail.addEventListener('init', function(evt) {
-    var ACTION_CONFIG = 'plugin.zpushconfig';
-
-    // add button to tabs list
-    var tab = $('<span>').attr('id', 'settingstabpluginzpushconfig').addClass('tablink');
-    var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.zpushconfig').html(rcmail.gettext('tabtitle', 'kolab_zpush')).appendTo(tab);
-    rcmail.add_element(tab, 'tabs');
-
-    if (rcmail.env.action == ACTION_CONFIG)
-        new kolab_zpush_config();
-});
-
-
-// extend jQuery
-(function($){
-  $.fn.serializeJSON = function(){
-    var json = {};
-    jQuery.map($(this).serializeArray(), function(n, i) {
-      json[n['name']] = n['value'];
-    });
-    return json;
-  };
-})(jQuery);
diff --git a/plugins/kolab_zpush/kolab_zpush.php b/plugins/kolab_zpush/kolab_zpush.php
deleted file mode 100644
index 6107f2c0..00000000
--- a/plugins/kolab_zpush/kolab_zpush.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-
-/**
- * Z-Push configuration utility for Kolab accounts
- *
- * @version 0.2
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_zpush extends rcube_plugin
-{
-    public $task = 'settings';
-    public $urlbase;
-
-    private $rc;
-    private $ui;
-    private $cache;
-    private $devices;
-    private $folders;
-    private $folders_meta;
-    private $root_meta;
-
-    const ROOT_MAILBOX = 'INBOX';
-    const CTYPE_KEY = '/shared/vendor/kolab/folder-type';
-    const ACTIVESYNC_KEY = '/private/vendor/kolab/activesync';
-
-    /**
-     * Plugin initialization.
-     */
-    public function init()
-    {
-        $this->rc = rcube::get_instance();
-
-        $this->require_plugin('jqueryui');
-        $this->add_texts('localization/', true);
-
-        $this->include_script('kolab_zpush.js');
-
-        $this->register_action('plugin.zpushconfig', array($this, 'config_view'));
-        $this->register_action('plugin.zpushjson', array($this, 'json_command'));
-
-        if ($this->rc->action == 'plugin.zpushconfig') {
-            $this->require_plugin('libkolab');
-        }
-    }
-
-
-    /**
-     * Establish IMAP connection
-     */
-    public function init_imap()
-    {
-        $storage = $this->rc->get_storage();
-
-        // @TODO: Metadata is already cached by rcube storage, get rid of cache here
-
-        $this->cache = $this->rc->get_cache('zpush', 'db', 900);
-        $this->cache->expunge();
-
-        if ($meta = $storage->get_metadata(self::ROOT_MAILBOX, self::ACTIVESYNC_KEY)) {
-            // clear cache if device config changed
-            if (($oldmeta = $this->cache->read('devicemeta')) && $oldmeta != $meta)
-                $this->cache->remove();
-
-            $this->root_meta = $this->unserialize_metadata($meta[self::ROOT_MAILBOX][self::ACTIVESYNC_KEY]);
-            $this->cache->remove('devicemeta');
-            $this->cache->write('devicemeta', $meta);
-        }
-    }
-
-
-    /**
-     * Handle JSON requests
-     */
-    public function json_command()
-    {
-        $storage = $this->rc->get_storage();
-        $cmd     = rcube_utils::get_input_value('cmd', rcube_utils::INPUT_GPC);
-        $imei    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
-
-        switch ($cmd) {
-        case 'load':
-            $result = array();
-            $devices = $this->list_devices();
-            if ($device = $devices[$imei]) {
-                $result['id'] = $imei;
-                $result['devicealias'] = $device['ALIAS'];
-                $result['syncmode'] = intval($device['MODE']);
-                $result['laxpic'] = intval($device['LAXPIC']);
-                $result['subscribed'] = array();
-
-                foreach ($this->folders_meta() as $folder => $meta) {
-                    if ($meta[$imei]['S'])
-                        $result['subscribed'][$folder] = intval($meta[$imei]['S']);
-                }
-
-                $this->rc->output->command('plugin.zpush_data_ready', $result);
-            }
-            else {
-                $this->rc->output->show_message($this->gettext('devicenotfound'), 'error');
-            }
-            break;
-
-        case 'save':
-            $syncmode     = intval(rcube_utils::get_input_value('syncmode', rcube_utils::INPUT_POST));
-            $laxpic       = intval(rcube_utils::get_input_value('laxpic', rcube_utils::INPUT_POST));
-            $devicealias  = rcube_utils::get_input_value('devicealias', rcube_utils::INPUT_POST, true);
-            $subsciptions = rcube_utils::get_input_value('subscribed', rcube_utils::INPUT_POST);
-            $devices = $this->list_devices();
-            $err     = false;
-
-            if ($device = $devices[$imei]) {
-                // update device config if changed
-                if ($devicealias != $this->root_meta['DEVICE'][$imei]['ALIAS']  ||
-                       $syncmode != $this->root_meta['DEVICE'][$imei]['MODE']   ||
-                       $laxpic   != $this->root_meta['DEVICE'][$imei]['LAXPIC'] ||
-                       $subsciptions[self::ROOT_MAILBOX] != $this->root_meta['FOLDER'][$imei]['S']) {
-                    $this->root_meta['DEVICE'][$imei]['MODE'] = $syncmode;
-                    $this->root_meta['DEVICE'][$imei]['ALIAS'] = $devicealias;
-                    $this->root_meta['DEVICE'][$imei]['LAXPIC'] = $laxpic;
-                    $this->root_meta['FOLDER'][$imei]['S'] = intval($subsciptions[self::ROOT_MAILBOX]);
-
-                    $err = !$storage->set_metadata(self::ROOT_MAILBOX,
-                        array(self::ACTIVESYNC_KEY => $this->serialize_metadata($this->root_meta)));
-
-                    // update cached meta data
-                    if (!$err) {
-                        $this->cache->remove('devicemeta');
-                        $this->cache->write('devicemeta', $storage->get_metadata(self::ROOT_MAILBOX, self::ACTIVESYNC_KEY));
-                    }
-                }
-                // iterate over folders list and update metadata if necessary
-                foreach ($this->folders_meta() as $folder => $meta) {
-                    // skip root folder (already handled above)
-                    if ($folder == self::ROOT_MAILBOX)
-                        continue;
-
-                    if ($subsciptions[$folder] != $meta[$imei]['S']) {
-                        $meta[$imei]['S'] = intval($subsciptions[$folder]);
-                        $this->folders_meta[$folder] = $meta;
-                        unset($meta['TYPE']);
-
-                        // read metadata first
-                        $folderdata = $storage->get_metadata($folder, array(self::ACTIVESYNC_KEY));
-                        if ($asyncdata = $folderdata[$folder][self::ACTIVESYNC_KEY])
-                            $metadata = $this->unserialize_metadata($asyncdata);
-                        $metadata['FOLDER'] = $meta;
-
-                        $err |= !$storage->set_metadata($folder, array(self::ACTIVESYNC_KEY => $this->serialize_metadata($metadata)));
-                    }
-                }
-
-                // update cache
-                $this->cache->remove('folders');
-                $this->cache->write('folders', $this->folders_meta);
-
-                $this->rc->output->command('plugin.zpush_save_complete', array('success' => !$err, 'id' => $imei, 'devicealias' => rcube::Q($devicealias)));
-            }
-
-            if ($err)
-                $this->rc->output->show_message($this->gettext('savingerror'), 'error');
-            else
-                $this->rc->output->show_message($this->gettext('successfullysaved'), 'confirmation');
-
-            break;
-
-        case 'delete':
-            $devices = $this->list_devices();
-
-            if ($device = $devices[$imei]) {
-                unset($this->root_meta['DEVICE'][$imei], $this->root_meta['FOLDER'][$imei]);
-
-                // update annotation and cached meta data
-                if ($success = $storage->set_metadata(self::ROOT_MAILBOX, array(self::ACTIVESYNC_KEY => $this->serialize_metadata($this->root_meta)))) {
-                    $this->cache->remove('devicemeta');
-                    $this->cache->write('devicemeta', $storage->get_metadata(self::ROOT_MAILBOX, self::ACTIVESYNC_KEY));
-
-                    // remove device annotation in every folder
-                    foreach ($this->folders_meta() as $folder => $meta) {
-                        // skip root folder (already handled above)
-                        if ($folder == self::ROOT_MAILBOX)
-                            continue;
-
-                        if (isset($meta[$imei])) {
-                            $type = $meta['TYPE'];  // remember folder type
-                            unset($meta[$imei], $meta['TYPE']);
-
-                            // read metadata first and update FOLDER property
-                            $folderdata = $storage->get_metadata($folder, array(self::ACTIVESYNC_KEY));
-                            if ($asyncdata = $folderdata[$folder][self::ACTIVESYNC_KEY])
-                                $metadata = $this->unserialize_metadata($asyncdata);
-                            $metadata['FOLDER'] = $meta;
-
-                            if ($storage->set_metadata($folder, array(self::ACTIVESYNC_KEY => $this->serialize_metadata($metadata)))) {
-                                $this->folders_meta[$folder] = $metadata;
-                                $this->folders_meta[$folder]['TYPE'] = $type;
-                            }
-                        }
-                    }
-
-                    // update cache
-                    $this->cache->remove('folders');
-                    $this->cache->write('folders', $this->folders_meta);
-                }
-            }
-
-            if ($success) {
-                $this->rc->output->show_message($this->gettext('successfullydeleted'), 'confirmation');
-                $this->rc->output->redirect(array('action' => 'plugin.zpushconfig'));  // reload UI
-            }
-            else
-                $this->rc->output->show_message($this->gettext('savingerror'), 'error');
-
-            break;
-        }
-
-        $this->rc->output->send();
-    }
-
-
-    /**
-     * Render main UI for device configuration
-     */
-    public function config_view()
-    {
-        require_once $this->home . '/kolab_zpush_ui.php';
-
-        $storage = $this->rc->get_storage();
-
-        // checks if IMAP server supports any of METADATA, ANNOTATEMORE, ANNOTATEMORE2
-        if (!($storage->get_capability('METADATA') || $storage->get_capability('ANNOTATEMORE') || $storage->get_capability('ANNOTATEMORE2'))) {
-            $this->rc->output->show_message($this->gettext('notsupported'), 'error');
-        }
-
-        $this->ui = new kolab_zpush_ui($this);
-
-        $this->register_handler('plugin.devicelist', array($this->ui, 'device_list'));
-        $this->register_handler('plugin.deviceconfigform', array($this->ui, 'device_config_form'));
-        $this->register_handler('plugin.foldersubscriptions', array($this->ui, 'folder_subscriptions'));
-
-        $this->rc->output->set_env('devicecount', count($this->list_devices()));
-        $this->rc->output->send('kolab_zpush.config');
-    }
-
-
-    /**
-     * List known devices
-     *
-     * @return array Device list as hash array
-     */
-    public function list_devices()
-    {
-        if (!isset($this->devices)) {
-            $this->init_imap();
-            $this->devices = (array)$this->root_meta['DEVICE'];
-        }
-
-        return $this->devices;
-    }
-
-
-    /**
-     * Get list of all folders available for sync
-     *
-     * @return array List of mailbox folders
-     */
-    public function list_folders()
-    {
-        if (!isset($this->folders)) {
-            // read cached folder meta data
-            if ($cached_folders = $this->cache->read('folders')) {
-                $this->folders_meta = $cached_folders;
-                $this->folders = array_keys($this->folders_meta);
-            }
-            // fetch folder data from server
-            else {
-                $storage       = $this->rc->get_storage();
-                $this->folders = $storage->list_folders();
-
-                foreach ($this->folders as $folder) {
-                    $folderdata = $storage->get_metadata($folder, array(self::ACTIVESYNC_KEY, self::CTYPE_KEY));
-                    $foldertype = explode('.', $folderdata[$folder][self::CTYPE_KEY]);
-
-                    if ($asyncdata = $folderdata[$folder][self::ACTIVESYNC_KEY]) {
-                        $metadata = $this->unserialize_metadata($asyncdata);
-                        $this->folders_meta[$folder] = $metadata['FOLDER'];
-                    }
-                    $this->folders_meta[$folder]['TYPE'] = !empty($foldertype[0]) ? $foldertype[0] : 'mail';
-                }
-
-                // cache it!
-                $this->cache->write('folders', $this->folders_meta);
-            }
-        }
-
-        return $this->folders;
-    }
-
-    /**
-     * Getter for folder metadata
-     *
-     * @return array Hash array with meta data for each folder
-     */
-    public function folders_meta()
-    {
-        if (!isset($this->folders_meta))
-            $this->list_folders();
-
-        return $this->folders_meta;
-    }
-
-    /**
-     * Helper method to decode saved IMAP metadata
-     */
-    private function unserialize_metadata($str)
-    {
-        if (!empty($str))
-            return @json_decode(base64_decode($str), true);
-
-        return null;
-    }
-
-    /**
-     * Helper method to encode IMAP metadata for saving
-     */
-    private function serialize_metadata($data)
-    {
-        if (is_array($data))
-            return base64_encode(json_encode($data));
-
-        return '';
-    }
-
-}
diff --git a/plugins/kolab_zpush/kolab_zpush_ui.php b/plugins/kolab_zpush/kolab_zpush_ui.php
deleted file mode 100644
index 780426d9..00000000
--- a/plugins/kolab_zpush/kolab_zpush_ui.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/**
- * Z-Push configuration user interface builder
- *
- * @version 0.2
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_zpush_ui
-{
-    private $rc;
-    private $config;
-
-    public function __construct($config)
-    {
-        $this->config = $config;
-        $this->rc = rcube::get_instance();
-
-        $skin = $this->rc->config->get('skin');
-        $this->config->include_stylesheet('skins/' . $skin . '/config.css');
-        $this->rc->output->include_script('list.js');
-        $this->skin_path = $this->config->urlbase . 'skins/' . $skin . '/';
-    }
-
-
-    public function device_list($attrib = array())
-    {
-        $attrib += array('id' => 'devices-list');
-
-        $devices = $this->config->list_devices();
-        $table = new html_table();
-
-        foreach ($devices as $id => $device) {
-            $name = $device['ALIAS'] ? $device['ALIAS'] : $id;
-            $table->add_row(array('id' => 'rcmrow' . $id));
-            $table->add(null, html::span('devicealias', rcube::Q($name)) . html::span('devicetype', rcube::Q($device['TYPE'])));
-        }
-
-        $this->rc->output->add_gui_object('devicelist', $attrib['id']);
-        $this->rc->output->set_env('devices', $devices);
-
-        return $table->show($attrib);
-    }
-
-
-    public function device_config_form($attrib = array())
-    {
-        $table = new html_table(array('cols' => 2));
-
-        $field_id = 'config-device-alias';
-        $input = new html_inputfield(array('name' => 'devicealias', 'id' => $field_id, 'size' => 40));
-        $table->add('title', html::label($field_id, $this->config->gettext('devicealias')));
-        $table->add(null, $input->show());
-
-        $field_id = 'config-device-mode';
-        $select = new html_select(array('name' => 'syncmode', 'id' => $field_id));
-        $select->add(array($this->config->gettext('modeauto'), $this->config->gettext('modeflat'), $this->config->gettext('modefolder')), array('-1', '0', '1'));
-        $table->add('title', html::label($field_id, $this->config->gettext('syncmode')));
-        $table->add(null, $select->show('-1'));
-
-        $field_id = 'config-device-laxpic';
-        $checkbox = new html_checkbox(array('name' => 'laxpic', 'value' => '1', 'id' => $field_id));
-        $table->add('title', $this->config->gettext('imageformat'));
-        $table->add(null, html::label($field_id, $checkbox->show() . ' ' . $this->config->gettext('laxpiclabel')));
-
-        if ($attrib['form'])
-            $this->rc->output->add_gui_object('editform', $attrib['form']);
-
-        return $table->show($attrib);
-    }
-
-
-    public function folder_subscriptions($attrib = array())
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'foldersubscriptions';
-
-        // group folders by type (show only known types)
-        $folder_groups = array('mail' => array(), 'contact' => array(), 'event' => array(), 'task' => array());
-        $folder_meta = $this->config->folders_meta();
-        foreach ($this->config->list_folders() as $folder) {
-            $type = $folder_meta[$folder]['TYPE'] ? $folder_meta[$folder]['TYPE'] : 'mail';
-            if (is_array($folder_groups[$type]))
-                $folder_groups[$type][] = $folder;
-        }
-
-        // build block for every folder type
-        foreach ($folder_groups as $type => $group) {
-            if (empty($group))
-                continue;
-            $attrib['type'] = $type;
-            $html .= html::div('subscriptionblock',
-                html::tag('h3', $type, $this->config->gettext($type)) .
-                $this->folder_subscriptions_block($group, $attrib));
-        }
-        
-        $this->rc->output->add_gui_object('subscriptionslist', $attrib['id']);
-
-        return html::div($attrib, $html);
-    }
-
-    public function folder_subscriptions_block($a_folders, $attrib)
-    {
-        $alarms = ($attrib['type'] == 'event' || $attrib['type'] == 'task');
-
-        $table = new html_table(array('cellspacing' => 0));
-        $table->add_header('subscription', $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'], 'title' => $this->config->gettext('synchronize'))) : '');
-        $table->add_header('alarm', $alarms && $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'], 'title' => $this->config->gettext('withalarms'))) : '');
-        $table->add_header('foldername', $this->config->gettext('folder'));
-
-        $checkbox_sync = new html_checkbox(array('name' => 'subscribed[]', 'class' => 'subscription'));
-        $checkbox_alarm = new html_checkbox(array('name' => 'alarm[]', 'class' => 'alarm'));
-
-        $names = array();
-        foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_name($folder));
-
-            // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
-            for ($i = count($names)-1; $i >= 0; $i--) {
-                if (strpos($foldername, $names[$i].' &raquo; ') === 0) {
-                    $length = strlen($names[$i].' &raquo; ');
-                    $prefix = substr($foldername, 0, $length);
-                    $count  = count(explode(' &raquo; ', $prefix));
-                    $foldername = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($foldername, $length);
-                    break;
-                }
-            }
-
-            $names[] = $origname;
-            $classes = array('mailbox');
-
-            if ($folder_class = $this->rc->folder_classname($folder)) {
-                $foldername = $this->rc->gettext($folder_class);
-                $classes[] = $folder_class;
-            }
-
-            $folder_id = 'rcmf' . rcube_utils::html_identifier($folder);
-
-            $table->add_row();
-            $table->add('subscription', $checkbox_sync->show('', array('value' => $folder, 'id' => $folder_id)));
-
-            if ($alarms)
-                $table->add('alarm', $checkbox_alarm->show('', array('value' => $folder, 'id' => $folder_id.'_alarm')));
-            else
-                $table->add('alarm', '');
-
-            $table->add(join(' ', $classes), html::label($folder_id, rcube::Q($foldername)));
-        }
-
-        return $table->show();
-    }
-
-}
diff --git a/plugins/kolab_zpush/localization/de_CH.inc b/plugins/kolab_zpush/localization/de_CH.inc
deleted file mode 100644
index 74445a49..00000000
--- a/plugins/kolab_zpush/localization/de_CH.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Geräte';
-$labels['devicealias'] = 'Gerätename';
-$labels['syncmode'] = 'Modus';
-$labels['modeauto'] = 'Automatisch';
-$labels['modeflat'] = 'Flache Struktur erzwingen';
-$labels['modefolder'] = 'Ordnerstruktur erzwingen';
-$labels['synchronize'] = 'Synchronisieren';
-$labels['withalarms'] = 'Mit Erinnerungen';
-$labels['syncsettings'] = 'Synchronisationseinstellungen';
-$labels['deviceconfig'] = 'Gerätekonfiguration';
-$labels['folderstosync'] = 'Order zum Synchronisieren';
-$labels['mail'] = 'E-Mail';
-$labels['contact'] = 'Kontakte';
-$labels['event'] = 'Kalender';
-$labels['task'] = 'Aufgaben';
-$labels['note'] = 'Notizen';
-$labels['deletedevice'] = 'Gerät löschen';
-$labels['imageformat'] = 'Bildformat';
-$labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['introtext'] = 'Wählen Sie das zu konfigurierende Gerät aus';
-$labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Z_push#Clients">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
-$labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['savingerror'] = 'Fehler beim Speichern';
-$labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
-$labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
-$labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-?>
diff --git a/plugins/kolab_zpush/localization/de_DE.inc b/plugins/kolab_zpush/localization/de_DE.inc
deleted file mode 100644
index 74445a49..00000000
--- a/plugins/kolab_zpush/localization/de_DE.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Geräte';
-$labels['devicealias'] = 'Gerätename';
-$labels['syncmode'] = 'Modus';
-$labels['modeauto'] = 'Automatisch';
-$labels['modeflat'] = 'Flache Struktur erzwingen';
-$labels['modefolder'] = 'Ordnerstruktur erzwingen';
-$labels['synchronize'] = 'Synchronisieren';
-$labels['withalarms'] = 'Mit Erinnerungen';
-$labels['syncsettings'] = 'Synchronisationseinstellungen';
-$labels['deviceconfig'] = 'Gerätekonfiguration';
-$labels['folderstosync'] = 'Order zum Synchronisieren';
-$labels['mail'] = 'E-Mail';
-$labels['contact'] = 'Kontakte';
-$labels['event'] = 'Kalender';
-$labels['task'] = 'Aufgaben';
-$labels['note'] = 'Notizen';
-$labels['deletedevice'] = 'Gerät löschen';
-$labels['imageformat'] = 'Bildformat';
-$labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['introtext'] = 'Wählen Sie das zu konfigurierende Gerät aus';
-$labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Z_push#Clients">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
-$labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['savingerror'] = 'Fehler beim Speichern';
-$labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
-$labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
-$labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-?>
diff --git a/plugins/kolab_zpush/localization/en_US.inc b/plugins/kolab_zpush/localization/en_US.inc
deleted file mode 100644
index 56e2790a..00000000
--- a/plugins/kolab_zpush/localization/en_US.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$labels = array();
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
-$labels['synchronize'] = 'Synchronize';
-$labels['withalarms'] = 'With alarms';
-$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configuration';
-$labels['folderstosync'] = 'Folders to synchronize';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['configuration'] = 'Configuration';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['introtext'] = 'Select a device to configure';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Z_push#Clients">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
-$labels['savingdata'] = 'Saving data...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-
-?>
\ No newline at end of file
diff --git a/plugins/kolab_zpush/localization/pl_PL.inc b/plugins/kolab_zpush/localization/pl_PL.inc
deleted file mode 100644
index 64d63854..00000000
--- a/plugins/kolab_zpush/localization/pl_PL.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$labels['tabtitle'] = 'ActiveSync';
-$labels['devices'] = 'Urządzenia';
-$labels['devicealias'] = 'Nazwa urządzenia';
-$labels['syncmode'] = 'Tryb synchronizacji';
-$labels['modeauto'] = 'Ustaw automatycznie';
-$labels['modeflat'] = 'Wymuś tryb płaski';
-$labels['modefolder'] = 'Wymuś tryb folderu';
-$labels['synchronize'] = 'Synchronizuj';
-$labels['withalarms'] = 'Z alarmami';
-$labels['syncsettings'] = 'Ustawienia synchronizacji';
-$labels['deviceconfig'] = 'Konfiguracja urządzenia';
-$labels['folderstosync'] = 'Foldery do synchronizacji';
-$labels['mail'] = 'Poczta';
-$labels['contact'] = 'Książki adresowe';
-$labels['event'] = 'Kalendarze';
-$labels['task'] = 'Zadania';
-$labels['note'] = 'Notatki';
-$labels['deletedevice'] = 'Usuń urządzenie';
-$labels['imageformat'] = 'Format obrazka';
-$labels['laxpiclabel'] = 'Zezwalaj na obrazki PNG i GIF';
-$labels['introtext'] = 'Wybierz urządzenie do skonfigurowania';
-$labels['nodevices'] = 'Obecnie brak zarejestrowanych urządzeń.<br/><br/>Aby zarejestrować urządzenie najpierw podłącz je do serwera według <a href="http://wiki.kolab.org/Z_push#Clients">instrukcji z Wiki</a>. Po tym procesie urządzenie powinno dać się skonfigurować tutaj.';
-$labels['savingdata'] = 'Zapisywanie danych...';
-$labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
-$labels['notsupported'] = 'Twój serwer nie obsługuje metadanych (metadata/annotations).';
-$labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację dla tego urządzenia?';
-$labels['successfullydeleted'] = 'Konfiguracja urządzenia została pomyślnie usunięta.';
-?>
diff --git a/plugins/kolab_zpush/package.xml b/plugins/kolab_zpush/package.xml
deleted file mode 100644
index ffa27d0b..00000000
--- a/plugins/kolab_zpush/package.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>kolab_zpush</name>
-    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Z-Push configuration utility for Kolab accounts</summary>
-	<description></description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-05-14</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPL</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="kolab_zpush.php" role="php"></file>
-			<file name="kolab_zpush_ui.php" role="php"></file>
-			<file name="kolab_zpush.js" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="skins/classic/templates/config.html" role="data"></file>
-			<file name="skins/classic/config.css" role="data"></file>
-			<file name="skins/classic/alarm-clock.png" role="data"></file>
-			<file name="skins/classic/deviceactions.png" role="data"></file>
-			<file name="skins/classic/foldertypes.png" role="data"></file>
-			<file name="skins/classic/pointer-left.gif" role="data"></file>
-			<file name="skins/classic/synchronize.png" role="data"></file>
-			<file name="skins/larry/templates/config.html" role="data"></file>
-			<file name="skins/larry/config.css" role="data"></file>
-			<file name="skins/larry/alarm-clock.png" role="data"></file>
-			<file name="skins/larry/deviceactions.png" role="data"></file>
-			<file name="skins/larry/foldertypes.png" role="data"></file>
-			<file name="skins/larry/pointer-left.png" role="data"></file>
-			<file name="skins/larry/synchronize.png" role="data"></file>
-			<file name="README" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-		</dir>
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<package>
-				<name>kolab_core</name>
-				<uri>http://kolabsys.com</uri>
-			</package>
-			<package>
-				<name>jqueryui</name>
-				<channel>pear.roundcube.net</uri>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/kolab_zpush/skins/classic/alarm-clock.png b/plugins/kolab_zpush/skins/classic/alarm-clock.png
deleted file mode 100755
index 518bdc11..00000000
Binary files a/plugins/kolab_zpush/skins/classic/alarm-clock.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/classic/config.css b/plugins/kolab_zpush/skins/classic/config.css
deleted file mode 100644
index a3f0f188..00000000
--- a/plugins/kolab_zpush/skins/classic/config.css
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Stylesheets for the Kolab Z-Push configuration UI */
-#configform {
-	padding-top: 15px;
-}
-
-#devices-table {
-	width: 100%;
-	table-layout: fixed;
-}
-
-#devices-table td {
-	cursor: pointer;
-}
-
-#devices-table td span.devicetype {
-	padding-left: 1em;
-	font-style: italic;
-	color: #666;
-}
-
-#devices-table tr.selected td span.devicetype {
-	color: #ccc;
-}
-
-.boxfooter a.button.delete,
-.boxfooter a.buttonPas.delete {
-	background-image: url(deviceactions.png);
-}
-
-div.subscriptionblock {
-	float: left;
-	margin: 0.5em 3em 2em 0;
-	padding: 0;
-	border: 1px solid #ddd;
-}
-
-div.subscriptionblock h3 {
-	font-size: 12px;
-	color: #333;
-	margin: 0 0 0.4em 0;
-	padding: 4px 4px 5px 30px;
-	background: url(foldertypes.png) 4px 4px no-repeat #fbfbfb;
-}
-
-div.subscriptionblock h3.contact {
-	background-position: 4px -16px;
-}
-
-div.subscriptionblock h3.event {
-	background-position: 4px -36px;
-}
-
-div.subscriptionblock h3.task {
-	background-position: 4px -56x;
-}
-
-div.subscriptionblock h3.note {
-	background-position: 4px -76px;
-}
-
-#foldersubscriptions thead td {
-	color: #999;
-	font-weight: bold;
-	padding: 3px 5px;
-	min-width: 2em;
-}
-
-#foldersubscriptions tbody td {
-	padding: 2px 5px;
-	border-top: 1px solid #ddd;
-}
-
-#foldersubscriptions td label {
-	display: block;
-}
-
-#foldersubscriptions td.mailbox {
-	padding-right: 3em;
-	padding-left: 2px;
-	min-width: 12em;
-}
-
-#foldersubscriptions td.virtual {
-	color: #999;
-}
-
-#foldersubscriptions {
-	overflow: auto;
-	max-height: 400px;
-	margin-top: 0.5em;
-}
-
-#introtext {
-	position: absolute;
-	top: 12px;
-	left: 5px;
-	padding-left: 10px;
-	max-width: 40em;
-}
-
-#introtext .pointer-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 14px;
-	height: 100%;
-	background: url(pointer-left.gif) right center no-repeat;
-}
-
-#introtext .inner {
-	border: 3px solid #e7e7e7;
-	background: #fff;
-}
-
-#introtext .bordered {
-	padding: 12px;
-	border: 1px solid #ccc;
-	background: #fff;
-}
diff --git a/plugins/kolab_zpush/skins/classic/deviceactions.png b/plugins/kolab_zpush/skins/classic/deviceactions.png
deleted file mode 100644
index a542df91..00000000
Binary files a/plugins/kolab_zpush/skins/classic/deviceactions.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/classic/foldertypes.png b/plugins/kolab_zpush/skins/classic/foldertypes.png
deleted file mode 100644
index 4950296a..00000000
Binary files a/plugins/kolab_zpush/skins/classic/foldertypes.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/classic/pointer-left.gif b/plugins/kolab_zpush/skins/classic/pointer-left.gif
deleted file mode 100644
index b2de5850..00000000
Binary files a/plugins/kolab_zpush/skins/classic/pointer-left.gif and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/classic/synchronize.png b/plugins/kolab_zpush/skins/classic/synchronize.png
deleted file mode 100755
index ba5ebd1f..00000000
Binary files a/plugins/kolab_zpush/skins/classic/synchronize.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/classic/templates/config.html b/plugins/kolab_zpush/skins/classic/templates/config.html
deleted file mode 100644
index beb062f2..00000000
--- a/plugins/kolab_zpush/skins/classic/templates/config.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="sectionslist">
-<div id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_zpush.devices" /></div>
-<div class="boxlistcontent">
-	<roundcube:object name="plugin.devicelist" id="devices-table" class="records-table" cellspacing="0" />
-</div>
-<div class="boxfooter">
-	<roundcube:button type="link" command="plugin.delete-device" title="kolab_zpush.deletedevice" class="buttonPas delete" classAct="button delete" content=" " />
-</div>
-</div>
-
-<div id="prefs-box">
-	<div class="boxtitle" style="display:none"><roundcube:label name="kolab_zpush.syncsettings"></div>
-	<form action="#" method="post" id="configform" class="boxcontent" style="display:none">
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.deviceconfig" /></legend>
-			<roundcube:object name="plugin.deviceconfigform" form="configform" />
-		</fieldset>
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
-		</fieldset>
-		<p class="formbuttons">
-			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
-			<roundcube:button type="input" class="button" command="plugin.delete-device" label="kolab_zpush.deletedevice" />
-		</p>
-	</form>
-	<div id="introtext">
-		<div class="inner"><div class="bordered">
-			<roundcube:if condition="env:devicecount" />
-				<roundcube:label name="kolab_zpush.introtext" />
-			<roundcube:else />
-				<roundcube:label name="kolab_zpush.nodevices" html="true" />
-			<roundcube:endif />
-		</div></div>
-		<div class="pointer-left"></div>
-	</div>
-</div>
-
-</div>
-
-<script type="text/javascript">
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195 });
-	rcmail.add_onload('viewsplit.init()');
-</script>
-
-</body>
-</html>
diff --git a/plugins/kolab_zpush/skins/larry/alarm-clock.png b/plugins/kolab_zpush/skins/larry/alarm-clock.png
deleted file mode 100755
index 518bdc11..00000000
Binary files a/plugins/kolab_zpush/skins/larry/alarm-clock.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/larry/config.css b/plugins/kolab_zpush/skins/larry/config.css
deleted file mode 100644
index 40d5b87a..00000000
--- a/plugins/kolab_zpush/skins/larry/config.css
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Stylesheets for the Kolab Z-Push configuration UI */
-
-#configform {
-	padding-top: 15px;
-}
-
-#sectionslist {
-	width: 220px;
-}
-
-#prefs-box {
-	position: absolute;
-	top: 0;
-	left: 232px;
-	right: 0;
-	bottom: 0;
-}
-
-#devices-table {
-	width: 100%;
-	table-layout: fixed;
-}
-
-#devices-table td {
-	cursor: pointer;
-}
-
-#devices-table td span.devicetype {
-	padding-left: 1em;
-	font-style: italic;
-	color: #69939e;
-}
-
-div.subscriptionblock {
-	float: left;
-	margin: 0 3em 2em 0;
-	padding: 0;
-}
-
-div.subscriptionblock h3 {
-	font-size: 14px;
-	color: #333;
-	margin: 0 0 0.6em 0;
-	padding: 2px 4px 2px 30px;
-	background: url(foldertypes.png) 4px 2px no-repeat;
-}
-
-div.subscriptionblock h3.contact {
-	background-position: 4px -18px;
-}
-
-div.subscriptionblock h3.event {
-	background-position: 4px -38px;
-}
-
-div.subscriptionblock h3.task {
-	background-position: 4px -58x;
-}
-
-div.subscriptionblock h3.note {
-	background-position: 4px -78px;
-}
-
-#foldersubscriptions thead td {
-	color: #69939e;
-	font-weight: bold;
-	padding: 3px 5px;
-	min-width: 2em;
-	background: #d6eaf3;
-	border-bottom: 2px solid #fff;
-}
-
-#foldersubscriptions tbody td {
-	background: #eee;
-	padding: 2px 5px;
-	border-bottom: 2px solid #fff;
-}
-
-#foldersubscriptions td label {
-	display: block;
-}
-
-#foldersubscriptions td.mailbox {
-	padding-right: 3em;
-	padding-left: 2px;
-	min-width: 12em;
-}
-
-#foldersubscriptions td.virtual {
-	color: #999;
-}
-
-#foldersubscriptions {
-	overflow: auto;
-	max-height: 400px;
-	margin-top: 0.5em;
-}
-
-#introtext {
-	position: absolute;
-	top: 16px;
-	left: 5px;
-	padding-left: 10px;
-	max-width: 40em;
-}
-
-#introtext .pointer-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 12px;
-	height: 80%;
-	background: url(pointer-left.png) right center no-repeat;
-}
-
-#introtext .inner {
-	color: #eee;
-	padding: 12px;
-	border: 1px solid #333;
-	border-radius: 4px;
-	text-shadow: 0px 1px 1px #333;
-	background: #5b5b5b;
-	background: -moz-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5b5b5b), color-stop(100%,#3a3a3a));
-	background: -o-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	background: -ms-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	background: linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	-webkit-box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
-	-moz-box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
-	box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
-}
-
-#introtext a {
-	color: #b0ccd7;
-}
diff --git a/plugins/kolab_zpush/skins/larry/foldertypes.png b/plugins/kolab_zpush/skins/larry/foldertypes.png
deleted file mode 100644
index 4950296a..00000000
Binary files a/plugins/kolab_zpush/skins/larry/foldertypes.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/larry/pointer-left.png b/plugins/kolab_zpush/skins/larry/pointer-left.png
deleted file mode 100644
index bfa7e86c..00000000
Binary files a/plugins/kolab_zpush/skins/larry/pointer-left.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/larry/synchronize.png b/plugins/kolab_zpush/skins/larry/synchronize.png
deleted file mode 100755
index ba5ebd1f..00000000
Binary files a/plugins/kolab_zpush/skins/larry/synchronize.png and /dev/null differ
diff --git a/plugins/kolab_zpush/skins/larry/templates/config.html b/plugins/kolab_zpush/skins/larry/templates/config.html
deleted file mode 100644
index 9671bc6a..00000000
--- a/plugins/kolab_zpush/skins/larry/templates/config.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body>
-
-<roundcube:include file="/includes/header.html" />
-
-<div id="mainscreen" class="offset">
-
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="settings-right">
-
-<div id="sectionslist" class="uibox listbox">
-<h2 id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_zpush.devices" /></h2>
-<div class="boxlistcontent">
-	<roundcube:object name="plugin.devicelist" id="devices-table" class="listing" cellspacing="0" />
-</div>
-<div class="boxfooter">
-	<roundcube:button type="link" command="plugin.delete-device" title="kolab_zpush.deletedevice" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="x" />
-</div>
-</div>
-
-<div id="prefs-box" class="uibox contentbox">
-	<h1 class="boxtitle" style="display:none"><roundcube:label name="kolab_zpush.syncsettings"></h1>
-	<form action="#" method="post" id="configform" class="boxcontent tabbed" style="display:none">
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
-		</fieldset>
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.deviceconfig" /></legend>
-			<roundcube:object name="plugin.deviceconfigform" form="configform" class="propform" />
-		</fieldset>
-
-		<p class="formbuttons">
-			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
-			<roundcube:button type="input" class="button" command="plugin.delete-device" label="kolab_zpush.deletedevice" />
-		</p>
-	</form>
-
-	<div id="introtext">
-		<div class="inner">
-			<roundcube:if condition="env:devicecount" />
-				<roundcube:label name="kolab_zpush.introtext" />
-			<roundcube:else />
-				<roundcube:label name="kolab_zpush.nodevices" html="true" />
-			<roundcube:endif />
-		</div>
-		<div class="pointer-left"></div>
-	</div>
-
-	<roundcube:object name="message" id="message" class="statusbar" />
-</div>
-
-</div>
-
-<roundcube:include file="/includes/footer.html" />
-
-<script type="text/javascript">
-
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:226, min:150, size:12 });
-	rcmail.add_onload('viewsplit.init()');
-
-</script>
-
-</body>
-</html>
diff --git a/plugins/ldap_authentication/composer.json b/plugins/ldap_authentication/composer.json
index 36563945..4076d1cc 100644
--- a/plugins/ldap_authentication/composer.json
+++ b/plugins/ldap_authentication/composer.json
@@ -4,7 +4,7 @@
     "description": "LDAP Authentication (obsoleted)",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "0.1.0",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
diff --git a/plugins/libcalendaring/alarm.mp3 b/plugins/libcalendaring/alarm.mp3
new file mode 100644
index 00000000..c47c7eca
Binary files /dev/null and b/plugins/libcalendaring/alarm.mp3 differ
diff --git a/plugins/libcalendaring/alarm.wav b/plugins/libcalendaring/alarm.wav
new file mode 100644
index 00000000..ea2978f2
Binary files /dev/null and b/plugins/libcalendaring/alarm.wav differ
diff --git a/plugins/libcalendaring/composer.json b/plugins/libcalendaring/composer.json
index 63fa2345..ce593a4b 100644
--- a/plugins/libcalendaring/composer.json
+++ b/plugins/libcalendaring/composer.json
@@ -4,7 +4,7 @@
     "description": "Library providing common functions for calendaring plugins",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/libcalendaring/lib/Horde_Date.php b/plugins/libcalendaring/lib/Horde_Date.php
index 9197f846..5265acd5 100644
--- a/plugins/libcalendaring/lib/Horde_Date.php
+++ b/plugins/libcalendaring/lib/Horde_Date.php
@@ -393,8 +393,8 @@ class Horde_Date
      */
     public static function fromDays($days)
     {
-        if (function_exists('JDToGregorian')) {
-            list($month, $day, $year) = explode('/', JDToGregorian($days));
+        if (function_exists('jdtogregorian')) {
+            list($month, $day, $year) = explode('/', jdtogregorian($days));
         } else {
             $days = intval($days);
 
diff --git a/plugins/libcalendaring/lib/Horde_Date_Recurrence.php b/plugins/libcalendaring/lib/Horde_Date_Recurrence.php
index 19e372c2..9247257f 100644
--- a/plugins/libcalendaring/lib/Horde_Date_Recurrence.php
+++ b/plugins/libcalendaring/lib/Horde_Date_Recurrence.php
@@ -1,26 +1,27 @@
 <?php
 
 /**
- * This is a modified copy of Horde/Date/Recurrence.php
+ * This is a modified copy of Horde/Date/Recurrence.php (2015-01-05)
  * Pull the latest version of this file from the PEAR channel of the Horde
  * project at http://pear.horde.org by installing the Horde_Date package.
  */
 
-if (!class_exists('Horde_Date'))
-	require_once(dirname(__FILE__) . '/Horde_Date.php');
+if (!class_exists('Horde_Date')) {
+    require_once(__DIR__ . '/Horde_Date.php');
+}
 
 // minimal required implementation of Horde_Date_Translation to avoid a huge dependency nightmare
 class Horde_Date_Translation
 {
-	function t($arg) { return $arg; }
-	function ngettext($sing, $plur, $num) { return ($num > 1 ? $plur : $sing); }
+    function t($arg) { return $arg; }
+    function ngettext($sing, $plur, $num) { return ($num > 1 ? $plur : $sing); }
 }
 
 
 /**
  * This file contains the Horde_Date_Recurrence class and according constants.
  *
- * Copyright 2007-2012 Horde LLC (http://www.horde.org/)
+ * Copyright 2007-2015 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -285,14 +286,19 @@ class Horde_Date_Recurrence
     public function getRecurName()
     {
         switch ($this->getRecurType()) {
-        case self::RECUR_NONE: return Horde_Date_Translation::t("No recurrence");
-        case self::RECUR_DAILY: return Horde_Date_Translation::t("Daily");
-        case self::RECUR_WEEKLY: return Horde_Date_Translation::t("Weekly");
+        case self::RECUR_NONE:
+            return Horde_Date_Translation::t("No recurrence");
+        case self::RECUR_DAILY:
+            return Horde_Date_Translation::t("Daily");
+        case self::RECUR_WEEKLY:
+            return Horde_Date_Translation::t("Weekly");
         case self::RECUR_MONTHLY_DATE:
-        case self::RECUR_MONTHLY_WEEKDAY: return Horde_Date_Translation::t("Monthly");
+        case self::RECUR_MONTHLY_WEEKDAY:
+            return Horde_Date_Translation::t("Monthly");
         case self::RECUR_YEARLY_DATE:
         case self::RECUR_YEARLY_DAY:
-        case self::RECUR_YEARLY_WEEKDAY: return Horde_Date_Translation::t("Yearly");
+        case self::RECUR_YEARLY_WEEKDAY:
+            return Horde_Date_Translation::t("Yearly");
         }
     }
 
@@ -453,6 +459,7 @@ class Horde_Date_Recurrence
                 $next->compareDateTime($after) >= 0) {
                 return $next;
             }
+
             break;
 
         case self::RECUR_WEEKLY:
@@ -650,6 +657,10 @@ class Horde_Date_Recurrence
                 $next = clone $estart;
                 $next->setNthWeekday($weekday, $nth);
 
+                if ($next->month != $estart->month) {
+                    // We're already in the next month.
+                    continue;
+                }
                 if ($next->compareDateTime($after) < 0) {
                     // We haven't made it past $after yet, try again.
                     continue;
@@ -875,7 +886,10 @@ class Horde_Date_Recurrence
      */
     public function addException($year, $month, $mday)
     {
-        $this->exceptions[] = sprintf('%04d%02d%02d', $year, $month, $mday);
+        $key = sprintf('%04d%02d%02d', $year, $month, $mday);
+        if (array_search($key, $this->exceptions) === false) {
+            $this->exceptions[] = sprintf('%04d%02d%02d', $year, $month, $mday);
+        }
     }
 
     /**
@@ -1053,13 +1067,15 @@ class Horde_Date_Recurrence
             if (strpos($remainder, '#') === 0) {
                 $this->setRecurCount(substr($remainder, 1));
             } else {
-                list($year, $month, $mday) = sscanf($remainder, '%04d%02d%02d');
+                list($year, $month, $mday, $hour, $min, $sec, $tz) =
+                    sscanf($remainder, '%04d%02d%02dT%02d%02d%02d%s');
                 $this->setRecurEnd(new Horde_Date(array('year' => $year,
                                                         'month' => $month,
                                                         'mday' => $mday,
-                                                        'hour' => 23,
-                                                        'min' => 59,
-                                                        'sec' => 59)));
+                                                        'hour' => $hour,
+                                                        'min' => $min,
+                                                        'sec' => $sec),
+                                                  $tz == 'Z' ? 'UTC' : $this->start->timezone));
             }
         }
     }
@@ -1225,15 +1241,23 @@ class Horde_Date_Recurrence
                 break;
             }
 
+            // MUST take into account the time portion if it is present.
+            // See Bug: 12869 and Bug: 2813
             if (isset($rdata['UNTIL'])) {
-                list($year, $month, $mday) = sscanf($rdata['UNTIL'],
-                                                    '%04d%02d%02d');
-                $this->setRecurEnd(new Horde_Date(array('year' => $year,
-                                                        'month' => $month,
-                                                        'mday' => $mday,
-                                                        'hour' => 23,
-                                                        'min' => 59,
-                                                        'sec' => 59)));
+                if (preg_match('/^(\d{4})-?(\d{2})-?(\d{2})T? ?(\d{2}):?(\d{2}):?(\d{2})(?:\.\d+)?(Z?)$/', $rdata['UNTIL'], $parts)) {
+                    $until = new Horde_Date($rdata['UNTIL'], 'UTC');
+                    $until->setTimezone($this->start->timezone);
+                } else {
+                    list($year, $month, $mday) = sscanf($rdata['UNTIL'],
+                                                        '%04d%02d%02d');
+                    $until = new Horde_Date(
+                        array('year' => $year,
+                              'month' => $month,
+                              'mday' => $mday + 1),
+                        $this->start->timezone
+                    );
+                }
+                $this->setRecurEnd($until);
             }
             if (isset($rdata['COUNT'])) {
                 $this->setRecurCount($rdata['COUNT']);
@@ -1266,16 +1290,18 @@ class Horde_Date_Recurrence
             break;
 
         case self::RECUR_WEEKLY:
-            $rrule = 'FREQ=WEEKLY;INTERVAL=' . $this->recurInterval . ';BYDAY=';
+            $rrule = 'FREQ=WEEKLY;INTERVAL=' . $this->recurInterval;
             $vcaldays = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
 
             for ($i = $flag = 0; $i <= 7; ++$i) {
                 if ($this->recurOnDay(pow(2, $i))) {
-                    if ($flag) {
+                    if ($flag == 0) {
+                        $rrule .= ';BYDAY=';
+                        $flag = 1;
+                    } else {
                         $rrule .= ',';
                     }
                     $rrule .= $vcaldays[$i];
-                    $flag = true;
                 }
             }
             break;
@@ -1341,13 +1367,13 @@ class Horde_Date_Recurrence
     }
 
     /**
-     * Parses the recurrence data from a hash.
+     * Parses the recurrence data from a Kolab hash.
      *
      * @param array $hash  The hash to convert.
      *
      * @return boolean  True if the hash seemed valid, false otherwise.
      */
-    public function fromHash($hash)
+    public function fromKolab($hash)
     {
         $this->reset();
 
@@ -1426,7 +1452,7 @@ class Horde_Date_Recurrence
                 break;
 
             case 'yearday':
-                if (!isset($hash['month'])) {
+                if (!isset($hash['daynumber'])) {
                     $this->setRecurType(self::RECUR_NONE);
                     return false;
                 }
@@ -1537,23 +1563,31 @@ class Horde_Date_Recurrence
         }
 
         // Exceptions.
-        if (isset($hash['exceptions'])) {
-            $this->exceptions = $hash['exceptions'];
+        if (isset($hash['exclusion'])) {
+            foreach ($hash['exclusion'] as $exception) {
+                if ($exception instanceof DateTime) {
+                    $this->exceptions[] = $exception->format('Ymd');
+                }
+            }
         }
 
-        if (isset($hash['completions'])) {
-            $this->completions = $hash['completions'];
+        if (isset($hash['complete'])) {
+            foreach ($hash['complete'] as $completion) {
+                if ($exception instanceof DateTime) {
+                    $this->completions[] = $completion->format('Ymd');
+                }
+            }
         }
 
         return true;
     }
 
     /**
-     * Export this object into a hash.
+     * Export this object into a Kolab hash.
      *
      * @return array  The recurrence hash.
      */
-    public function toHash()
+    public function toKolab()
     {
         if ($this->getRecurType() == self::RECUR_NONE) {
             return array();
@@ -1651,15 +1685,20 @@ class Horde_Date_Recurrence
         } elseif ($this->hasRecurEnd()) {
             $date = $this->getRecurEnd();
             $hash['range-type'] = 'date';
-            $hash['range'] = $date->datestamp();
+            $hash['range'] = $date->toDateTime();
         } else {
             $hash['range-type'] = 'none';
             $hash['range'] = '';
         }
 
         // Recurrence exceptions
-        $hash['exceptions'] = $this->exceptions;
-        $hash['completions'] = $this->completions;
+        $hash['exclusion'] = $hash['complete'] = array();
+        foreach ($this->exceptions as $exception) {
+            $hash['exclusion'][] = new DateTime($exception);
+        }
+        foreach ($this->completions as $completionexception) {
+            $hash['complete'][] = new DateTime($completionexception);
+        }
 
         return $hash;
     }
diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index a36f27cc..1c7c08b6 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -44,7 +44,6 @@ class libcalendaring_itip
             array('identity' => $this->rc->user->list_emails(true)));
         $this->sender = $hook['identity'];
 
-        $this->plugin->add_hook('message_before_send', array($this, 'before_send_hook'));
         $this->plugin->add_hook('smtp_connect', array($this, 'smtp_connect_hook'));
     }
 
@@ -95,8 +94,9 @@ class libcalendaring_itip
      */
     public function send_itip_message($event, $method, $recipient, $subject, $bodytext, $message = null, $rsvp = true)
     {
-        if (!$this->sender['name'])
+        if (!$this->sender['name']) {
             $this->sender['name'] = $this->sender['email'];
+        }
 
         if (!$message) {
             libcalendaring::identify_recurrence_instance($event);
@@ -111,7 +111,7 @@ class libcalendaring_itip
             'name' => $subject,
             'vars' => array(
                 'title' => $event['title'],
-                'name' => $this->sender['name']
+                'name' => $this->sender['name'],
             )
         ));
 
@@ -134,20 +134,27 @@ class libcalendaring_itip
         $mailbody = $this->gettext(array(
             'name' => $bodytext,
             'vars' => array(
-                'title' => $event['title'],
-                'date' => $this->lib->event_date_text($event, true) . $recurrence_info,
-                'attendees' => join(",\n ", $attendees_list),
-                'sender' => $this->sender['name'],
-                'organizer' => $this->sender['name'],
+                'title'       => $event['title'],
+                'date'        => $this->lib->event_date_text($event, true) . $recurrence_info,
+                'attendees'   => join(",\n ", $attendees_list),
+                'sender'      => $this->sender['name'],
+                'organizer'   => $this->sender['name'],
+                'description' => $event['description'],
             )
         ));
 
+        // remove redundant empty lines (e.g. when an event description is empty)
+        $mailbody = preg_replace('/\n{3,}/', "\n\n", $mailbody);
+
         // if (!empty($event['comment'])) {
         //     $mailbody .= "\n\n" . $this->gettext('itipsendercomment') . $event['comment'];
         // }
 
         // append links for direct invitation replies
-        if ($method == 'REQUEST' && $rsvp && ($token = $this->store_invitation($event, $recipient['email']))) {
+        if ($method == 'REQUEST' && $rsvp
+            && $this->rc->config->get('calendar_itip_smtp_server')
+            && ($token = $this->store_invitation($event, $recipient['email']))
+        ) {
             $mailbody .= "\n\n" . $this->gettext(array(
                 'name' => 'invitationattendlinks',
                 'vars' => array('url' => $this->plugin->get_url(array('action' => 'attend', 't' => $token))),
@@ -161,7 +168,7 @@ class libcalendaring_itip
         $message->setTXTBody(rcube_mime::format_flowed($mailbody, 79));
 
         if ($this->rc->config->get('libcalendaring_itip_debug', false)) {
-            console('iTip ' . $method, $message->txtHeaders() . "\n\r" . $message->get());
+            rcube::console('iTip ' . $method, $message->txtHeaders() . "\r\n" . $message->get());
         }
 
         // finally send the message
@@ -172,20 +179,6 @@ class libcalendaring_itip
         return $sent;
     }
 
-    /**
-     * Plugin hook triggered by rcube::deliver_message() before delivering a message.
-     * Here we can set the 'smtp_server' config option to '' in order to use
-     * PHP's mail() function for unauthenticated email sending.
-     */
-    public function before_send_hook($p)
-    {
-        if ($this->itip_send && !$this->rc->user->ID && $this->rc->config->get('calendar_itip_smtp_server', null) === '') {
-            $this->rc->config->set('smtp_server', '');
-        }
-
-        return $p;
-    }
-
     /**
      * Plugin hook to alter SMTP authentication.
      * This is used if iTip messages are to be sent from an unauthenticated session
@@ -199,7 +192,7 @@ class libcalendaring_itip
             }
         }
 
-      return $p;
+        return $p;
     }
 
     /**
@@ -261,6 +254,21 @@ class libcalendaring_itip
             }
         }
 
+        // Set SENT-BY property if the sender is not the organizer
+        if ($method == 'CANCEL' || $method == 'REQUEST') {
+            foreach ((array)$event['attendees'] as $idx => $attendee) {
+                if ($attendee['role'] == 'ORGANIZER'
+                    && $attendee['email']
+                    && strcasecmp($attendee['email'], $from) != 0
+                    && strcasecmp($attendee['email'], $from_utf) != 0
+                ) {
+                    $attendee['sent-by'] = 'mailto:' . $from_utf;
+                    $event['organizer'] = $event['attendees'][$idx] = $attendee;
+                    break;
+                }
+            }
+        }
+
         // compose multipart message using PEAR:Mail_Mime
         $message = new Mail_mime("\r\n");
         $message->setParam('text_encoding', 'quoted-printable');
@@ -357,111 +365,230 @@ class libcalendaring_itip
      */
     public function get_itip_status($event, $existing = null)
     {
-      $action = $event['rsvp'] ? 'rsvp' : '';
-      $status = $event['fallback'];
-      $latest = false;
-      $html = '';
+        $action = $event['rsvp'] ? 'rsvp' : '';
+        $status = $event['fallback'];
+        $latest = $rescheduled = false;
+        $html   = '';
 
-      if (is_numeric($event['changed']))
-        $event['changed'] = new DateTime('@'.$event['changed']);
+        if (is_numeric($event['changed'])) {
+            $event['changed'] = new DateTime('@'.$event['changed']);
+        }
 
-      // check if the given itip object matches the last state
-      if ($existing) {
-        $latest = (isset($event['sequence']) && intval($existing['sequence']) == intval($event['sequence'])) ||
+        // check if the given itip object matches the last state
+        if ($existing) {
+            $latest = (isset($event['sequence']) && intval($existing['sequence']) == intval($event['sequence'])) ||
                   (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] >= $event['changed']);
-      }
+        }
 
-      // determine action for REQUEST
-      if ($event['method'] == 'REQUEST') {
-        $html = html::div('rsvp-status', $this->gettext('acceptinvitation'));
+        // determine action for REQUEST
+        if ($event['method'] == 'REQUEST') {
+            $html = html::div('rsvp-status', $this->gettext('acceptinvitation'));
 
-        if ($existing) {
-          $rsvp = $event['rsvp'];
-          $emails = $this->lib->get_user_emails();
-          foreach ($existing['attendees'] as $attendee) {
-            if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
-              $status = strtoupper($attendee['status']);
-              break;
+            if ($existing) {
+                $rsvp   = $event['rsvp'];
+                $emails = $this->lib->get_user_emails();
+
+                foreach ($existing['attendees'] as $attendee) {
+                    if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                        $status = strtoupper($attendee['status']);
+                        break;
+                    }
+                }
             }
-          }
-        }
-        else {
-          $rsvp = $event['rsvp'] && $this->rc->config->get('calendar_allow_itip_uninvited', true);
-        }
-
-        $status_lc = strtolower($status);
-
-        if ($status_lc == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
-          $html = html::div('rsvp-status', $this->gettext('notanattendee'));
-          $action = 'import';
-        }
-        else if (in_array($status_lc, $this->rsvp_status)) {
-          $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
-
-          if ($existing && ($existing['sequence'] > $event['sequence'] || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))) {
-            $action = '';  // nothing to do here, outdated invitation
-            if ($status_lc == 'needs-action')
-              $status_text = $this->gettext('outdatedinvitation');
-          }
-          else if (!$existing && !$rsvp) {
-            $action = 'import';
-          }
-          else if ($latest && $status_lc != 'needs-action') {
-            $action = 'update';
-          }
-
-          $html = html::div('rsvp-status ' . $status_lc, $status_text);
-        }
-      }
-      // determine action for REPLY
-      else if ($event['method'] == 'REPLY') {
-        // check whether the sender already is an attendee
-        if ($existing) {
-          $action = $this->rc->config->get('calendar_allow_itip_uninvited', true) ? 'accept' : '';
-          $listed = false;
-          foreach ($existing['attendees'] as $attendee) {
-            if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
-              $status_lc = strtolower($status);
-              if (in_array($status_lc, $this->rsvp_status)) {
-                $html = html::div('rsvp-status ' . $status_lc, $this->gettext(array(
-                    'name' => 'attendee' . $status_lc,
-                    'vars' => array(
-                        'delegatedto' => rcube::Q($event['delegated-to'] ?: ($attendee['delegated-to'] ?: '?')),
-                    )
-                )));
-              }
-              $action = $attendee['status'] == $status || !$latest ? '' : 'update';
-              $listed = true;
-              break;
+            else {
+                $rsvp = $event['rsvp'] && $this->rc->config->get('calendar_allow_itip_uninvited', true);
             }
-          }
 
-          if (!$listed) {
-            $html = html::div('rsvp-status', $this->gettext('itipnewattendee'));
-          }
-        }
-        else {
-          $html = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
-          $action = '';
-        }
-      }
-      else if ($event['method'] == 'CANCEL') {
-        if (!$existing) {
-          $html = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
-          $action = '';
-        }
-      }
+            $status_lc = strtolower($status);
 
-      return array(
-          'uid' => $event['uid'],
-          'id' => asciiwords($event['uid'], true),
-          'existing' => $existing ? true : false,
-          'saved' => $existing ? true : false,
-          'latest' => $latest,
-          'status' => $status,
-          'action' => $action,
-          'html' => $html,
-      );
+            if ($status_lc == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
+                $html = html::div('rsvp-status', $this->gettext('notanattendee'));
+                $action = 'import';
+            }
+            else if (in_array($status_lc, $this->rsvp_status)) {
+                $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
+
+                if ($existing && ($existing['sequence'] > $event['sequence']
+                    || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))
+                ) {
+                    $action = '';  // nothing to do here, outdated invitation
+                    if ($status_lc == 'needs-action') {
+                        $status_text = $this->gettext('outdatedinvitation');
+                    }
+                }
+                else if (!$existing && !$rsvp) {
+                    $action = 'import';
+                }
+                else {
+                    if ($latest) {
+                        $diff = $this->get_itip_diff($event, $existing);
+
+                        // Detect re-scheduling
+                        // FIXME: This is probably to simplistic, or maybe we should just check
+                        //        attendee's RSVP flag in the new event?
+                        $rescheduled = !empty($diff['start']) || !empty($diff['end']);
+                        unset($diff['start'], $diff['end']);
+                    }
+
+                    if ($rescheduled) {
+                        $action = 'rsvp';
+                        $latest = false;
+                    }
+                    else if ($status_lc != 'needs-action') {
+                        // check if there are any changes
+                        if ($latest) {
+                            $latest = empty($diff);
+                        }
+
+                        $action = !$latest ? 'update' : '';
+                    }
+                }
+
+                $html = html::div('rsvp-status ' . $status_lc, $status_text);
+            }
+        }
+        // determine action for REPLY
+        else if ($event['method'] == 'REPLY') {
+            // check whether the sender already is an attendee
+            if ($existing) {
+                // Relax checking if that is a reply to the latest version of the event
+                // We accept versions with older SEQUENCE but no significant changes (Bifrost#T78144)
+                if (!$latest) {
+                    $num = $got = 0;
+                    foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                        if (isset($existing[$key])) {
+                            if ($key == 'allday') {
+                                $event[$key] = $event[$key] == 'true';
+                            }
+                            $value = $existing[$key] instanceof DateTime ? $existing[$key]->format('c') : $existing[$key];
+                            $num++;
+                            $got += intval($value == $event[$key]);
+                        }
+                    }
+
+                    $latest = $num === $got;
+                }
+
+                $action = $this->rc->config->get('calendar_allow_itip_uninvited', true) ? 'accept' : '';
+                $listed = false;
+
+                foreach ($existing['attendees'] as $attendee) {
+                    if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
+                        $status_lc = strtolower($status);
+                        if (in_array($status_lc, $this->rsvp_status)) {
+                            $html = html::div('rsvp-status ' . $status_lc, $this->gettext(array(
+                                'name' => 'attendee' . $status_lc,
+                                'vars' => array(
+                                    'delegatedto' => rcube::Q($event['delegated-to'] ?: ($attendee['delegated-to'] ?: '?')),
+                                )
+                            )));
+                        }
+
+                        $action = $attendee['status'] == $status || !$latest ? '' : 'update';
+                        $listed = true;
+                        break;
+                    }
+                }
+
+                if (!$listed) {
+                    $html = html::div('rsvp-status', $this->gettext('itipnewattendee'));
+                }
+            }
+            else {
+                $html   = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
+                $action = '';
+            }
+        }
+        else if ($event['method'] == 'CANCEL') {
+            if (!$existing) {
+                $html   = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
+                $action = '';
+            }
+        }
+
+        return array(
+            'uid'        => $event['uid'],
+            'id'         => asciiwords($event['uid'], true),
+            'existing'   => $existing ? true : false,
+            'saved'      => $existing ? true : false,
+            'latest'     => $latest,
+            'status'     => $status,
+            'action'     => $action,
+            'rescheduled' => $rescheduled,
+            'html'       => $html,
+        );
+    }
+
+    protected function get_itip_diff($event, $existing)
+    {
+        if (empty($event) || empty($existing) || empty($event['message_uid'])) {
+            return;
+        }
+
+        $itip = $this->lib->mail_get_itip_object($event['mbox'], $event['message_uid'], $event['mime_id'],
+            $event['task'] == 'calendar' ? 'event' : 'task');
+
+        if ($itip) {
+            // List of properties that could change without SEQUENCE bump
+            $attrs = array('description', 'title', 'location', 'url');
+            $diff  = array();
+
+            foreach ($attrs as $attr) {
+                if (isset($itip[$attr]) && $itip[$attr] != $existing[$attr]) {
+                    $diff[$attr] = array(
+                        'new' => $itip[$attr],
+                        'old' => $existing[$attr]
+                    );
+                }
+            }
+
+            $status             = array();
+            $itip_attendees     = array();
+            $existing_attendees = array();
+            $emails             = $this->lib->get_user_emails();
+
+            // Compare list of attendees (ignoring current user status)
+            foreach ((array) $existing['attendees'] as $idx => $attendee) {
+                if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                    $status[strtolower($attendee['email'])] = $attendee['status'];
+                }
+                if ($attendee['role'] == 'ORGANIZER') {
+                    $attendee['status'] = 'ACCEPTED'; // sometimes is not set for exceptions
+                    $existing['attendees'][$idx] = $attendee;
+                }
+                $existing_attendees[] = $attendee['email'].$attendee['name'];
+            }
+            foreach ((array) $itip['attendees'] as $idx => $attendee) {
+                if ($attendee['email'] && ($_status = $status[strtolower($attendee['email'])])) {
+                    $attendee['status'] = $_status;
+                    $itip['attendees'][$idx] = $attendee;
+                }
+                $itip_attendees[] = $attendee['email'].$attendee['name'];
+            }
+
+            if ($itip_attendees != $existing_attendees) {
+                $diff['attendees'] = array(
+                    'new' => $itip['attendees'],
+                    'old' => $existing['attendees']
+                );
+            }
+
+            if ($existing['start'] != $itip['start']) {
+                $diff['start'] = array(
+                    'new' => $itip['start'],
+                    'old' => $existing['start'],
+                );
+            }
+
+            if ($existing['end'] != $itip['end']) {
+                $diff['end'] = array(
+                    'new' => $itip['end'],
+                    'old' => $existing['end'],
+                );
+            }
+
+            return $diff;
+        }
     }
 
     /**
@@ -482,6 +609,7 @@ class libcalendaring_itip
             'sequence' => intval($event['sequence']),
             'method'   => $method,
             'task'     => $task,
+            'mime_id'  => $mime_id,
         );
 
         // create buttons to be activated from async request checking existence of this event in local calendars
@@ -492,40 +620,63 @@ class libcalendaring_itip
             $title = $this->gettext('itipreply');
 
             foreach ($event['attendees'] as $attendee) {
-                if (!empty($attendee['email']) && $attendee['role'] != 'ORGANIZER' &&
-                      (empty($event['_sender']) || ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf']))) {
-                    $metadata['attendee'] = $attendee['email'];
-                    $rsvp_status = strtoupper($attendee['status']);
-                    if ($attendee['delegated-to'])
-                        $metadata['delegated-to'] = $attendee['delegated-to'];
-                    break;
+                if (!empty($attendee['email']) && $attendee['role'] != 'ORGANIZER') {
+                    if (empty($event['_sender']) || self::compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) {
+                        $metadata['attendee'] = $attendee['email'];
+                        $rsvp_status = strtoupper($attendee['status']);
+                        if ($attendee['delegated-to']) {
+                            $metadata['delegated-to'] = $attendee['delegated-to'];
+                        }
+                        break;
+                    }
+                }
+            }
+
+            // It may happen that sender's address is different in From: and the attached iTip
+            // In such case use the ATTENDEE entry with the address from From: header
+            if (empty($metadata['attendee']) && !empty($event['_sender'])) {
+                // remove the organizer
+                $itip_attendees = array_filter($event['attendees'], function($item) { return $item['role'] != 'ORGANIZER'; });
+
+                // there must be only one attendee
+                if (is_array($itip_attendees) && count($itip_attendees) == 1) {
+                    $event_attendee       = $itip_attendees[key($itip_attendees)];
+                    $metadata['attendee'] = $event['_sender'];
+                    $rsvp_status          = strtoupper($event_attendee['status']);
                 }
             }
 
             // 1. update the attendee status on our copy
             $update_button = html::tag('input', array(
-                'type' => 'button',
-                'class' => 'button',
+                'type'    => 'button',
+                'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
-                'value' => $this->gettext('updateattendeestatus'),
+                'value'   => $this->gettext('updateattendeestatus'),
             ));
 
             // 2. accept or decline a new or delegate attendee
             $accept_buttons = html::tag('input', array(
-                'type' => 'button',
-                'class' => "button accept",
+                'type'    => 'button',
+                'class'   => "button accept",
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
-                'value' => $this->gettext('acceptattendee'),
+                'value'   => $this->gettext('acceptattendee'),
             ));
             $accept_buttons .= html::tag('input', array(
-                'type' => 'button',
-                'class' => "button decline",
+                'type'    => 'button',
+                'class'   => "button decline",
                 'onclick' => "rcube_libcalendaring.decline_attendee_reply('" . rcube::JQ($mime_id) . "', '$task')",
-                'value' => $this->gettext('declineattendee'),
+                'value'   => $this->gettext('declineattendee'),
             ));
 
             $buttons[] = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
             $buttons[] = html::div(array('id' => 'accept-'.$dom_id, 'style' => 'display:none'), $accept_buttons);
+
+            // For replies we need more metadata
+            foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                if (isset($event[$key])) {
+                    $metadata[$key] = $event[$key] instanceof DateTime ? $event[$key]->format('c') : $event[$key];
+                }
+            }
         }
         // when receiving iTip REQUEST messages:
         else if ($method == 'REQUEST') {
@@ -547,10 +698,10 @@ class libcalendaring_itip
             // 1. display RSVP buttons (if the user was invited)
             foreach ($this->rsvp_actions as $method) {
                 $rsvp_buttons .= html::tag('input', array(
-                    'type' => 'button',
-                    'class' => "button $method",
+                    'type'    => 'button',
+                    'class'   => "button $method",
                     'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task', '$method', '$dom_id')",
-                    'value' => $this->gettext('itip' . $method),
+                    'value'   => $this->gettext('itip' . $method),
                 ));
             }
 
@@ -558,34 +709,35 @@ class libcalendaring_itip
             if (!empty($preview_url)) {
               $msgref = $this->lib->ical_message->folder . '/' . $this->lib->ical_message->uid . '#' . $mime_id;
               $rsvp_buttons .= html::tag('input', array(
-                  'type' => 'button',
-                  'class' => "button preview",
+                  'type'    => 'button',
+                  // TODO: Temp. disable this button on small screen in Elastic (Bifrost#T105747)
+                  'class'   => "button preview hidden-phone hidden-small",
                   'onclick' => "rcube_libcalendaring.open_itip_preview('" . rcube::JQ($preview_url) . "', '" . rcube::JQ($msgref) . "')",
-                  'value' => $this->gettext('openpreview'),
+                  'value'   => $this->gettext('openpreview'),
               ));
             }
 
             // 2. update the local copy with minor changes
             $update_button = html::tag('input', array(
-                'type' => 'button',
-                'class' => 'button',
+                'type'    => 'button',
+                'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
-                'value' => $this->gettext('updatemycopy'),
+                'value'   => $this->gettext('updatemycopy'),
             ));
 
             // 3. Simply import the event without replying
             $import_button = html::tag('input', array(
-                'type' => 'button',
-                'class' => 'button',
+                'type'    => 'button',
+                'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
-                'value' => $this->gettext('importtocalendar'),
+                'value'   => $this->gettext('importtocalendar'),
             ));
 
             // check my status
             foreach ($event['attendees'] as $attendee) {
                 if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
                     $metadata['attendee'] = $attendee['email'];
-                    $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
+                    $metadata['rsvp']     = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
                     $rsvp_status = !empty($attendee['status']) ? strtoupper($attendee['status']) : 'NEEDS-ACTION';
                     break;
                 }
@@ -606,9 +758,9 @@ class libcalendaring_itip
         else if ($method == 'CANCEL') {
             $title = $this->gettext('itipcancellation');
             $event_prop = array_filter(array(
-              'uid' => $event['uid'],
-              '_instance' => $event['_instance'],
-              '_savemode' => $event['_savemode'],
+                'uid'       => $event['uid'],
+                '_instance' => $event['_instance'],
+                '_savemode' => $event['_savemode'],
             ));
 
             // 1. remove the event from our calendar
@@ -621,10 +773,10 @@ class libcalendaring_itip
 
             // 2. update our copy with status=cancelled
             $button_update = html::tag('input', array(
-              'type' => 'button',
-              'class' => 'button',
-              'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
-              'value' => $this->gettext('updatemycopy'),
+                'type'    => 'button',
+                'class'   => 'button',
+                'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
+                'value'   => $this->gettext('updatemycopy'),
             ));
 
             $buttons[] = html::div(array('id' => 'rsvp-'.$dom_id, 'style' => 'display:none'), $button_remove . $button_update);
@@ -648,7 +800,7 @@ class libcalendaring_itip
         foreach (array('savingdata','deleteobjectconfirm','declinedeleteconfirm','declineattendee',
             'cancel','itipdelegated','declineattendeeconfirm','itipcomment','delegateinvitation',
             'delegateto','delegatersvpme','delegateinvalidaddress') as $label) {
-          $this->rc->output->command('add_label', "itip.$label", $this->gettext($label));
+            $this->rc->output->command('add_label', "itip.$label", $this->gettext($label));
         }
 
         // show event details with buttons
@@ -692,7 +844,7 @@ class libcalendaring_itip
 
         return html::div($attrib,
             html::div('label', $this->gettext('acceptinvitation')) .
-            html::div('rsvp-buttons',
+            html::div('rsvp-buttons itip-buttons',
                 $buttons .
                 html::div('itip-reply-controls', $this->itip_rsvp_options_ui($attrib['id']))
             )
@@ -712,17 +864,36 @@ class libcalendaring_itip
         }
         // add checkbox to suppress itip reply message
         else if ($itip_sending >= 2) {
+            $toggle_attrib = array(
+                'type'     => 'checkbox',
+                'id'       => 'noreply-'.$dom_id,
+                'value'    => 1,
+                'disabled' => $disable,
+                'checked'  => ($itip_sending & 1) == 0,
+            );
             $rsvp_additions = html::label(array('class' => 'noreply-toggle'),
-                html::tag('input', array('type' => 'checkbox', 'id' => 'noreply-'.$dom_id, 'value' => 1, 'disabled' => $disable, 'checked' => ($itip_sending & 1) == 0))
-                . ' ' . $this->gettext('itipsuppressreply')
+                html::tag('input', $toggle_attrib) . ' ' . $this->gettext('itipsuppressreply')
             );
         }
 
         // add input field for reply comment
-        $rsvp_additions .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
-        $rsvp_additions .= html::div('itip-reply-comment',
-            html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'name' => '_comment', 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
+        $toggle_attrib = array(
+            'href'    => '#toggle',
+            'class'   => 'reply-comment-toggle',
+            'onclick' => '$(this).hide().parent().find(\'textarea\').show().focus()'
         );
+        $textarea_attrib = array(
+            'id'    => 'reply-comment-' . $dom_id,
+            'name'  => '_comment',
+            'cols'  => 40,
+            'rows'  => 4,
+            'class' => 'form-control',
+            'style' => 'display:none',
+            'placeholder' => $this->gettext('itipcomment')
+        );
+
+        $rsvp_additions .= html::a($toggle_attrib, $this->gettext('itipeditresponse'))
+            . html::div('itip-reply-comment', html::tag('textarea', $textarea_attrib, ''));
 
         return $rsvp_additions;
     }
@@ -751,11 +922,11 @@ class libcalendaring_itip
             $table->add('label', $this->gettext('recurring'));
             $table->add('recurrence', $this->lib->recurrence_text($event['recurrence']));
         }
-        if ($event['location']) {
+        if ($event['location'] && trim($event['location'])) {
             $table->add('label', $this->gettext('location'));
             $table->add('location', rcube::Q($event['location']));
         }
-        if ($event['sensitivity'] && $event['sensitivity'] != 'public') {
+        if ($event['sensitivity'] && !preg_match('/^(x-|public$)/i', $event['sensitivity'])) {
             $table->add('label', $this->gettext('sensitivity'));
             $table->add('sensitivity', ucfirst($this->gettext($event['sensitivity'])) . '!');
         }
@@ -763,7 +934,7 @@ class libcalendaring_itip
             $table->add('label', $this->gettext('status'));
             $table->add('status', $this->gettext('status-' . strtolower($event['status'])));
         }
-        if ($event['comment']) {
+        if ($event['comment'] && trim($event['comment'])) {
             $table->add('label', $this->gettext('comment'));
             $table->add('location', rcube::Q($event['comment']));
         }
@@ -814,4 +985,14 @@ class libcalendaring_itip
       return $ret;
     }
 
+    /**
+     * Compare email address
+     */
+    public static function compare_email($value, $email, $email_utf = null)
+    {
+        $v1 = !empty($email) && strcasecmp($value, $email) === 0;
+        $v2 = !empty($email_utf) && strcasecmp($value, $email_utf) === 0;
+
+        return $v1 || $v2;
+    }
 }
diff --git a/plugins/libcalendaring/lib/libcalendaring_recurrence.php b/plugins/libcalendaring/lib/libcalendaring_recurrence.php
index bbc4976c..f83d024c 100644
--- a/plugins/libcalendaring/lib/libcalendaring_recurrence.php
+++ b/plugins/libcalendaring/lib/libcalendaring_recurrence.php
@@ -152,4 +152,83 @@ class libcalendaring_recurrence
         return $last;
     }
 
+    /**
+     * Find date/time of the first occurrence (excluding start date)
+     */
+    public function first_occurrence()
+    {
+        $start      = clone $this->start;
+        $orig_start = clone $this->start;
+        $r          = $this->recurrence;
+        $interval   = intval($r['INTERVAL'] ?: 1);
+
+        switch ($this->recurrence['FREQ']) {
+        case 'WEEKLY':
+            if (empty($this->recurrence['BYDAY'])) {
+                return $start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}W"));
+            break;
+
+        case 'MONTHLY':
+            if (empty($this->recurrence['BYDAY']) && empty($this->recurrence['BYMONTHDAY'])) {
+                return $start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}M"));
+            break;
+
+        case 'YEARLY':
+            if (empty($this->recurrence['BYDAY']) && empty($this->recurrence['BYMONTH'])) {
+                return $start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}Y"));
+            break;
+
+        default:
+            return $start;
+        }
+
+        $r = $this->recurrence;
+        $r['INTERVAL'] = $interval;
+        if ($r['COUNT']) {
+            // Increase count so we do not stop the loop to early
+            $r['COUNT'] += 100;
+        }
+
+        // Create recurrence that starts in the past
+        $recurrence = new self($this->lib);
+        $recurrence->init($r, $start);
+
+        // find the first occurrence
+        $found = false;
+        while ($next = $recurrence->next()) {
+            $start = $next;
+            if ($next >= $orig_start) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            rcube::raise_error(array(
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => sprintf("Failed to find a first occurrence. Start: %s, Recurrence: %s",
+                    $orig_start->format(DateTime::ISO8601), json_encode($r)),
+            ), true);
+
+            return null;
+        }
+
+        if ($start Instanceof Horde_Date) {
+            $start = $start->toDateTime();
+        }
+
+        $start->_dateonly = $this->dateonly;
+
+        return $start;
+    }
 }
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index 8495031b..3f918e3e 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -94,6 +94,59 @@ function rcube_libcalendaring(settings)
       return fromto;
     };
 
+    /**
+     * Checks if the event/task has 'real' attendees, excluding the current user
+     */
+    this.has_attendees = function(event)
+    {
+        return !!(event.attendees && event.attendees.length && (event.attendees.length > 1 || String(event.attendees[0].email).toLowerCase() != settings.identity.email));
+    };
+
+    /**
+     * Check if the current user is an attendee of this event/task
+     */
+    this.is_attendee = function(event, role, email)
+    {
+        var i, emails = email ? ';' + email.toLowerCase() : settings.identity.emails;
+
+        for (i=0; event.attendees && i < event.attendees.length; i++) {
+            if ((!role || event.attendees[i].role == role) && event.attendees[i].email && emails.indexOf(';'+event.attendees[i].email.toLowerCase()) >= 0) {
+                return event.attendees[i];
+            }
+        }
+
+        return false;
+    };
+
+    /**
+     * Checks if the current user is the organizer of the event/task
+     */
+    this.is_organizer = function(event, email)
+    {
+        return this.is_attendee(event, 'ORGANIZER', email) || !event.id;
+    };
+
+    /**
+     * Check permissions on the given folder object
+     */
+    this.has_permission = function(folder, perm)
+    {
+        // multiple chars means "either of"
+        if (String(perm).length > 1) {
+            for (var i=0; i < perm.length; i++) {
+                if (this.has_permission(folder, perm[i])) {
+                    return true;
+                }
+            }
+        }
+
+        if (folder.rights && String(folder.rights).indexOf(perm) >= 0) {
+            return true;
+        }
+
+        return (perm == 'i' && folder.editable) || (perm == 'v' && folder.editable);
+    };
+
 
     /**
      * From time and date strings to a real date object
@@ -338,19 +391,15 @@ function rcube_libcalendaring(settings)
         });
         $(prefix+' select.edit-alarm-offset').change(function(){
             var val = $(this).val(), parent = $(this).parent();
-            parent.find('.edit-alarm-date, .edit-alarm-time')[val == '@' ? 'show' : 'hide']();
+            parent.find('.edit-alarm-date, .edit-alarm-time')[val === '@' ? 'show' : 'hide']();
             parent.find('.edit-alarm-value').prop('disabled', val === '@' || val === '0');
-            parent.find('.edit-alarm-related')[val == '@' ? 'hide' : 'show']();
+            parent.find('.edit-alarm-related')[val === '@' ? 'hide' : 'show']();
         });
 
         $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(datepicker_settings);
 
-        $(prefix).on('click', 'a.delete-alarm', function(e){
-            if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
-                $(this).closest('.edit-alarm-item').remove();
-            }
-            return false;
-        });
+        if (rcmail.env.action != 'print')
+            this.init_time_autocomplete($(prefix+' .edit-alarm-time')[0], {});
 
         // set a unique id attribute and set label reference accordingly
         if ((index || 0) > 0 && dom_id) {
@@ -359,16 +408,32 @@ function rcube_libcalendaring(settings)
             $(prefix+' label:first').attr('for', dom_id);
         }
 
-        $(prefix).on('click', 'a.add-alarm', function(e){
-            var i = $(this).closest('.edit-alarm-item').siblings().length + 1;
-            var item = $(this).closest('.edit-alarm-item').clone(false)
-              .removeClass('first')
-              .appendTo(prefix);
+        // Elastic
+        if (window.UI && UI.pretty_select) {
+          $(prefix + ' select').each(function() { UI.pretty_select(this); });
+        }
 
-              me.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
-              $('select.edit-alarm-type, select.edit-alarm-offset', item).change();
-              return false;
-        });
+        if (index)
+            return;
+
+        $(prefix)
+            .on('click', 'a.delete-alarm', function(e){
+                if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
+                    $(this).closest('.edit-alarm-item').remove();
+                }
+                return false;
+            })
+            .on('click', 'a.add-alarm', function(e) {
+                var orig = $(this).closest('.edit-alarm-item'),
+                    i = orig.siblings().length + 1,
+                    item = orig.clone(false)
+                      .removeClass('first')
+                      .appendTo(orig.parent());
+
+                  me.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
+                  $('select.edit-alarm-type, select.edit-alarm-offset', item).change();
+                  return false;
+            });
     }
 
     this.set_alarms_edit = function(prefix, valarms)
@@ -378,15 +443,15 @@ function rcube_libcalendaring(settings)
         var i, alarm, domnode, val, offset;
         for (i=0; i < valarms.length; i++) {
           alarm = valarms[i];
+
           if (!alarm.action)
               alarm.action = 'DISPLAY';
 
-          if (i == 0) {
-              domnode = $(prefix + ' .edit-alarm-item').eq(0);
-          }
-          else {
-              domnode = $(prefix + ' .edit-alarm-item').eq(0).clone(false).removeClass('first').appendTo(prefix);
-              this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
+          domnode = $(prefix + ' .edit-alarm-item').eq(0);
+
+          if (i > 0) {
+            domnode = domnode.clone(false).removeClass('first').insertAfter(domnode);
+            this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
           }
 
           $('select.edit-alarm-type', domnode).val(alarm.action);
@@ -443,6 +508,121 @@ function rcube_libcalendaring(settings)
         return valarms;
     };
 
+    // format time string
+    var time_autocomplete_format = function(hour, minutes, start) {
+        var time, diff, unit, duration = '', d = new Date();
+
+        d.setHours(hour);
+        d.setMinutes(minutes);
+        time = me.format_time(d);
+
+        if (start) {
+            diff = Math.floor((d.getTime() - start.getTime()) / 60000);
+            if (diff > 0) {
+                unit = 'm';
+                if (diff >= 60) {
+                    unit = 'h';
+                    diff = Math.round(diff / 3) / 20;
+                }
+                duration = ' (' + diff + unit + ')';
+            }
+        }
+
+        return [time, duration];
+    };
+
+    var time_autocomplete_list = function(p, callback) {
+        // Time completions
+        var st, h, step = 15, result = [], now = new Date(),
+            id = String(this.element.attr('id')),
+            m = id.match(/^(.*)-(starttime|endtime)$/),
+            start = (m && m[2] == 'endtime'
+                && (st = $('#' + m[1] + '-starttime').val())
+                && $('#' + m[1] + '-startdate').val() == $('#' + m[1] + '-enddate').val())
+                ? me.parse_datetime(st, '') : null,
+            full = p.term - 1 > 0 || p.term.length > 1,
+            hours = start ? start.getHours() : (full ? me.parse_datetime(p.term, '') : now).getHours(),
+            minutes = hours * 60 + (full ? 0 : now.getMinutes()),
+            min = Math.ceil(minutes / step) * step % 60,
+            hour = Math.floor(Math.ceil(minutes / step) * step / 60);
+
+        // list hours from 0:00 till now
+        for (h = start ? start.getHours() : 0; h < hours; h++)
+            result.push(time_autocomplete_format(h, 0, start));
+
+        // list 15min steps for the next two hours
+        for (; h < hour + 2 && h < 24; h++) {
+            while (min < 60) {
+                result.push(time_autocomplete_format(h, min, start));
+                min += step;
+            }
+            min = 0;
+        }
+
+        // list the remaining hours till 23:00
+        while (h < 24)
+            result.push(time_autocomplete_format((h++), 0, start));
+
+        return callback(result);
+    };
+
+    var time_autocomplete_open = function(event, ui) {
+        // scroll to current time
+        var $this = $(this),
+            widget = $this.autocomplete('widget')
+            menu = $this.data('ui-autocomplete').menu,
+            amregex = /^(.+)(a[.m]*)/i,
+            pmregex = /^(.+)(p[.m]*)/i,
+            val = $(this).val().replace(amregex, '0:$1').replace(pmregex, '1:$1');
+
+        widget.css('width', '10em');
+
+        if (val === '')
+            menu._scrollIntoView(widget.children('li:first'));
+        else
+            widget.children().each(function() {
+                var li = $(this),
+                    html = li.children().first().html()
+                        .replace(/\s+\(.+\)$/, '')
+                        .replace(amregex, '0:$1')
+                        .replace(pmregex, '1:$1');
+
+                if (html.indexOf(val) == 0)
+                    menu._scrollIntoView(li);
+            });
+    };
+
+    /**
+     * Initializes time autocompletion
+     */
+    this.init_time_autocomplete = function(elem, props)
+    {
+        var default_props = {
+                delay: 100,
+                minLength: 1,
+                appendTo: props.container || $(elem).parents('form'),
+                source: time_autocomplete_list,
+                open: time_autocomplete_open,
+                // change: time_autocomplete_change,
+                select: function(event, ui) {
+                    $(this).val(ui.item[0]).change();
+                    return false;
+                }
+            };
+
+        $(elem).attr('autocomplete', "off")
+            .autocomplete($.extend(default_props, props))
+            .click(function() {  // show drop-down upon clicks
+                $(this).autocomplete('search', $(this).val() ? $(this).val().replace(/\D.*/, "") : " ");
+            });
+
+        $(elem).data('ui-autocomplete')._renderItem = function(ul, item) {
+            return $('<li>')
+                .data('ui-autocomplete-item', item)
+                .append('<a>' + item[0] + item[1] + '</a>')
+                .appendTo(ul);
+        };
+    };
 
     /*****  Alarms handling  *****/
 
@@ -455,45 +635,73 @@ function rcube_libcalendaring(settings)
         if (this.alarm_dialog)
             this.alarm_dialog.dialog('destroy').remove();
 
-        this.alarm_dialog = $('<div>').attr('id', 'alarm-display');
+        var i, actions, adismiss, asnooze, alarm, html, type,
+            audio_alarms = [], records = [], event_ids = [], buttons = [];
 
-        var i, actions, adismiss, asnooze, alarm, html, event_ids = [], buttons = {};
         for (i=0; i < alarms.length; i++) {
             alarm = alarms[i];
             alarm.start = this.parseISO8601(alarm.start);
             alarm.end = this.parseISO8601(alarm.end);
+
+            if (alarm.action == 'AUDIO') {
+                audio_alarms.push(alarm);
+                continue;
+            }
+
             event_ids.push(alarm.id);
 
-            html = '<h3 class="event-title">' + Q(alarm.title) + '</h3>';
+            type = alarm.id.match(/^task/) ? 'type-task' : 'type-event';
+
+            html = '<h3 class="event-title ' + type + '">' + Q(alarm.title) + '</h3>';
             html += '<div class="event-section">' + Q(alarm.location || '') + '</div>';
             html += '<div class="event-section">' + Q(this.event_date_text(alarm)) + '</div>';
 
-            adismiss = $('<a href="#" class="alarm-action-dismiss"></a>').html(rcmail.gettext('dismiss','libcalendaring')).click(function(e){
-                me.dismiss_link = $(this);
-                me.dismiss_alarm(me.dismiss_link.data('id'), 0, e);
-            });
-            asnooze = $('<a href="#" class="alarm-action-snooze"></a>').html(rcmail.gettext('snooze','libcalendaring')).click(function(e){
-                me.snooze_dropdown($(this), e);
-                e.stopPropagation();
-                return false;
-            });
-            actions = $('<div>').addClass('alarm-actions').append(adismiss.data('id', alarm.id)).append(asnooze.data('id', alarm.id));
+            adismiss = $('<a href="#" class="alarm-action-dismiss"></a>')
+                .text(rcmail.gettext('dismiss','libcalendaring'))
+                .click(function(e) {
+                    me.dismiss_link = $(this);
+                    me.dismiss_alarm(me.dismiss_link.data('id'), 0, e);
+                });
+            asnooze = $('<a href="#" class="alarm-action-snooze"></a>')
+                .text(rcmail.gettext('snooze','libcalendaring'))
+                .click(function(e) {
+                    me.snooze_dropdown($(this), e);
+                    e.stopPropagation();
+                    return false;
+                });
 
-            $('<div>').addClass('alarm-item').html(html).append(actions).appendTo(this.alarm_dialog);
+            actions = $('<div>').addClass('alarm-actions').append(adismiss.data('id', alarm.id)).append(asnooze.data('id', alarm.id));
+            records.push($('<div>').addClass('alarm-item').html(html).append(actions));
         }
 
-        buttons[rcmail.gettext('close')] = function() {
-            $(this).dialog('close');
-        };
+        if (audio_alarms.length)
+            this.audio_alarms(audio_alarms);
 
-        buttons[rcmail.gettext('dismissall','libcalendaring')] = function(e) {
-            // submit dismissed event_ids to server
-            me.dismiss_alarm(me.alarm_ids.join(','), 0, e);
-            $(this).dialog('close');
-        };
+        if (!records.length)
+            return;
+
+        this.alarm_dialog = $('<div>').attr('id', 'alarm-display').append(records);
+
+        buttons.push({
+            text: rcmail.gettext('dismissall','libcalendaring'),
+            click: function(e) {
+                // submit dismissed event_ids to server
+                me.dismiss_alarm(me.alarm_ids.join(','), 0, e);
+                $(this).dialog('close');
+            },
+            'class': 'delete'
+        });
+
+        buttons.push({
+            text: rcmail.gettext('close'),
+            click: function() {
+                $(this).dialog('close');
+            },
+            'class': 'cancel'
+        });
 
         this.alarm_dialog.appendTo(document.body).dialog({
-            modal: false,
+            modal: true,
             resizable: true,
             closeOnEscape: false,
             dialogClass: 'alarms',
@@ -520,6 +728,39 @@ function rcube_libcalendaring(settings)
         this.alarm_ids = event_ids;
     };
 
+    /**
+     * Display a notification and play a sound for a set of alarms
+     */
+    this.audio_alarms = function(alarms)
+    {
+        var elem, txt = [],
+            src = rcmail.assets_path('plugins/libcalendaring/alarm'),
+            plugin = navigator.mimeTypes ? navigator.mimeTypes['audio/mp3'] : {};
+
+        // first generate and display notification text
+        $.each(alarms, function() { txt.push(this.title); });
+
+        rcmail.display_message(rcmail.gettext('alarmtitle','libcalendaring') + ': ' + Q(txt.join(', ')), 'notice', 10000);
+
+        // Internet Explorer does not support wav files,
+        // support in other browsers depends on enabled plugins,
+        // so we use wav as a fallback
+
+        src += bw.ie || (plugin && plugin.enabledPlugin) ? '.mp3' : '.wav';
+
+        // HTML5
+        try {
+            elem = $('<audio>').attr('src', src);
+            elem.get(0).play();
+        }
+        // old method
+        catch (e) {
+            elem = $('<embed id="libcalsound" src="' + src + '" hidden=true autostart=true loop=false />');
+            elem.appendTo($('body'));
+            window.setTimeout("$('#libcalsound').remove()", 10000);
+        }
+    };
+
     /**
      * Show a drop-down menu with a selection of snooze times
      */
@@ -728,10 +969,8 @@ function rcube_libcalendaring(settings)
             .html('<span>' + Q(this.format_datetime(date, 1)) + '</span>')
             .appendTo('#edit-recurrence-rdates');
 
-        $('<a>').attr('href', '#del')
-            .addClass('iconbutton delete')
-            .html(rcmail.get_label('delete', 'libcalendaring'))
-            .attr('title', rcmail.get_label('delete', 'libcalendaring'))
+        $('<a>').attr({href: '#del', 'class': 'iconbutton delete icon button', title: rcmail.get_label('delete', 'libcalendaring')})
+            .append($('<span class="inner">').text(rcmail.get_label('delete', 'libcalendaring')))
             .appendTo(li);
     };
 
@@ -819,8 +1058,7 @@ function rcube_libcalendaring(settings)
             var li = $('<li>').addClass('link')
                 .addClass('message eml')
                 .append($('<a>')
-                    .attr('href', link.mailurl)
-                    .addClass('messagelink')
+                    .attr({href: link.mailurl, 'class': 'messagelink'})
                     .text(link.subject || link.uri)
                 )
                 .appendTo(ul);
@@ -828,21 +1066,63 @@ function rcube_libcalendaring(settings)
             // add icon to remove the link
             if (edit) {
                 $('<a>')
-                    .attr('href', '#delete')
-                    .attr('title', rcmail.gettext('removelink', plugin))
-                    .attr('data-uri', link.uri)
-                    .addClass('delete')
-                    .text(rcmail.gettext('delete'))
+                    .attr({href: '#delete', title: rcmail.gettext('removelink', plugin), 'data-uri': link.uri, 'class': 'delete'})
+                    .append($('<span class="inner">').text(rcmail.gettext('delete')))
                     .appendTo(li);
             }
         });
 
         container.empty().append(ul);
     }
+
+    // resize and reposition (center) the dialog window
+    this.dialog_resize = function(id, height, width)
+    {
+        var win = $(window), w = win.width(), h = win.height(),
+            dialog = $('.ui-dialog:visible'),
+            h_delta = dialog.find('.ui-dialog-titlebar').outerHeight() + dialog.find('.ui-dialog-buttonpane').outerHeight() + 30,
+            w_delta = 50;
+
+        $(id).dialog('option', {
+            height: Math.min(h-20, height + h_delta),
+            width: Math.min(w-20, width + w_delta)
+        });
+    };
 }
 
 //////  static methods
 
+// render HTML code for displaying an attendee record
+rcube_libcalendaring.attendee_html = function(data)
+{
+    var name, tooltip = '', context = 'libcalendaring',
+        dispname = data.name || data.email,
+        status = data.role == 'ORGANIZER' ? 'ORGANIZER' : data.status;
+
+    if (status)
+        status = status.toLowerCase();
+
+    if (data.email) {
+        tooltip = data.email;
+        name = $('<a>').attr({href: 'mailto:' + data.email, 'class': 'mailtolink', 'data-cutype': data.cutype})
+
+        if (status)
+            tooltip += ' (' + rcmail.gettext('status' + status, context) + ')';
+    }
+    else {
+        name = $('<span>');
+    }
+
+    if (data['delegated-to'])
+        tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
+    else if (data['delegated-from'])
+        tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
+
+    return $('<span>').append(
+            $('<span>').attr({'class': 'attendee ' + status, title: tooltip}).append(name.text(dispname))
+        ).html();
+};
+
 /**
  *
  */
@@ -898,29 +1178,33 @@ rcube_libcalendaring.add_from_itip_mail = function(mime_id, task, status, dom_id
 rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
 {
     // show dialog for entering the delegatee address and comment
-    var html = '<form class="itip-dialog-form" action="javascript:void()">' +
-        '<div class="form-section">' +
-            '<label for="itip-delegate-to">' + rcmail.gettext('itip.delegateto') + '</label><br/>' +
+    var dialog, buttons = [];
+    var form = $('<form class="itip-dialog-form propform" action="javascript:void()">' +
+        '<div class="form-section form-group">' +
+            '<label for="itip-delegate-to">' + rcmail.gettext('itip.delegateto') + '</label>' +
             '<input type="text" id="itip-delegate-to" class="text" size="40" value="" />' +
         '</div>' +
-        '<div class="form-section">' +
-            '<label for="itip-delegate-rsvp">' +
-                '<input type="checkbox" id="itip-delegate-rsvp" class="checkbox" size="40" value="" />' +
-                rcmail.gettext('itip.delegatersvpme') +
-            '</label>' +
+        '<div class="form-section form-group form-check">' +
+            '<label for="itip-delegate-rsvp">' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
+            '<input type="checkbox" id="itip-delegate-rsvp" value="1" />' +
         '</div>' +
-        '<div class="form-section">' +
+        '<div class="form-section form-group">' +
             '<textarea id="itip-delegate-comment" class="itip-comment" cols="40" rows="8" placeholder="' +
                 rcmail.gettext('itip.itipcomment') + '"></textarea>' + 
         '</div>' +
-        '<div class="form-section">' +
-            (selector && selector.length ? selector.html() : '') +
-        '</div>' +
-    '</form>';
+    '</form>');
+
+    if (selector && selector.length) {
+        form.append(
+            $('<div class="form-section form-group">')
+                .append($('<label for="itip-saveto">').text(rcmail.gettext('libcalendaring.savein')))
+                .append($('select', selector).clone(true))
+        );
+    }
 
-    var dialog, buttons = [];
     buttons.push({
         text: rcmail.gettext('itipdelegated', 'itip'),
+        'class': 'save mainaction',
         click: function() {
             var doc = window.parent.document,
                 delegatee = String($('#itip-delegate-to', doc).val()).replace(/(^\s+)|(\s+$)/, '');
@@ -936,20 +1220,21 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
                 setTimeout(function() { dialog.dialog("close"); }, 500);
             }
             else {
-                alert(rcmail.gettext('itip.delegateinvalidaddress'));
+                rcmail.alert_dialog(rcmail.gettext('itip.delegateinvalidaddress'));
                 $('#itip-delegate-to', doc).focus();
             }
         }
     });
 
     buttons.push({
-        text: rcmail.gettext('cancel', 'itip'),
+        text: rcmail.gettext('cancel'),
+        'class': 'cancel',
         click: function() {
             dialog.dialog('close');
         }
     });
 
-    dialog = rcmail.show_popup_dialog(html, rcmail.gettext('delegateinvitation', 'itip'), buttons, {
+    dialog = rcmail.show_popup_dialog(form, rcmail.gettext('delegateinvitation', 'itip'), buttons, {
         width: 460,
         open: function(event, ui) {
             $(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
@@ -981,19 +1266,20 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
  */
 rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback)
 {
-    var mnu = $('<ul></ul>').addClass('popupmenu libcal-rsvp-replymode');
+    var menu = $('<ul></ul>').attr('class', 'popupmenu libcal-rsvp-replymode');
 
     $.each(['all','current'/*,'future'*/], function(i, mode) {
-        $('<li><a>' + rcmail.get_label('rsvpmode'+mode, 'libcalendaring') + '</a>')
-        .addClass('ui-menu-item')
-        .attr('rel', mode)
-        .appendTo(mnu);
+        $('<li>')
+            .attr({rel: mode, 'class': 'ui-menu-item'})
+            .append($('<a>').attr({tabindex: "0", 'class': 'ui-menu-item-wrapper'})
+                .text(rcmail.get_label('rsvpmode' + mode)))
+            .appendTo(menu);
     });
 
     var action = btn.attr('rel');
 
-    // open the mennu
-    mnu.menu({
+    // open the menu
+    menu.menu({
         select: function(event, ui) {
             callback(action, ui.item.attr('rel'));
         }
@@ -1004,8 +1290,8 @@ rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback)
 
     setTimeout(function() {
         $(document).one('click', function() {
-            mnu.menu('destroy');
-            mnu.remove();
+            menu.menu('destroy');
+            menu.remove();
         });
     }, 100);
 };
@@ -1015,12 +1301,9 @@ rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback)
  */
 rcube_libcalendaring.remove_from_itip = function(event, task, title)
 {
-    if (confirm(rcmail.gettext('itip.deleteobjectconfirm').replace('$title', title))) {
-        rcmail.http_post(task + '/itip-remove',
-            event,
-            rcmail.set_busy(true, 'itip.savingdata')
-        );
-    }
+    rcmail.confirm_dialog(rcmail.gettext('itip.deleteobjectconfirm').replace('$title', title), 'delete', function() {
+        rcmail.http_post(task + '/itip-remove', event, rcmail.set_busy(true, 'itip.savingdata'));
+    });
 };
 
 /**
@@ -1069,6 +1352,8 @@ rcube_libcalendaring.decline_attendee_reply = function(mime_id, task)
  */
 rcube_libcalendaring.fetch_itip_object_status = function(p)
 {
+  p.mbox = rcmail.env.mailbox;
+  p.message_uid = rcmail.env.uid;
   rcmail.http_post(p.task + '/itip-status', { data: p });
 };
 
@@ -1095,10 +1380,14 @@ rcube_libcalendaring.update_itip_object_status = function(p)
     $('#rsvp-'+p.id+' input.button').prop('disabled', false)
       .filter('.'+String(p.status||'unknown').toLowerCase()).prop('disabled', p.latest);
   }
- 
+
   // show rsvp/import buttons (with calendar selector)
   $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
 
+  // highlight date if date change detected
+  if (p.rescheduled)
+    $('.calendar-eventdetails td.date').addClass('modified');
+
   // show itip box appendix after replacing the given placeholders
   if (p.append && p.append.selector) {
     var elem = $(p.append.selector);
@@ -1112,6 +1401,10 @@ rcube_libcalendaring.update_itip_object_status = function(p)
     }
     elem.show();
   }
+
+  if (window.UI && UI.pretty_select) {
+    $('#rsvp-'+p.id+' select').each(function() { UI.pretty_select(this); });
+  }
 };
 
 /**
@@ -1188,23 +1481,4 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
   rcmail.addEventListener('plugin.update_itip_object_status', rcube_libcalendaring.update_itip_object_status)
     .addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status)
     .addEventListener('plugin.itip_message_processed', rcube_libcalendaring.itip_message_processed);
-
-  $('.rsvp-buttons').on('click', 'a.reply-comment-toggle', function(e){
-    $(this).hide().parent().find('textarea').show().focus();
-    return false;
-  });
-
-  if (rcmail.env.action == 'get-attachment' && rcmail.gui_objects['attachmentframe']) {
-    rcmail.register_command('print-attachment', function() {
-      var frame = rcmail.get_frame_window(rcmail.gui_objects['attachmentframe'].id);
-      if (frame) frame.print();
-    }, true);
-  }
-
-  if (rcmail.env.action == 'get-attachment' && rcmail.env.attachment_download_url) {
-    rcmail.register_command('download-attachment', function() {
-      rcmail.location_href(rcmail.env.attachment_download_url, window);
-    }, true);
-  }
-
 });
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index a3fc7679..0ee7af9a 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -59,7 +59,6 @@ class libcalendaring extends rcube_plugin
     );
 
     private static $instance;
-    private static $email_regex = '/([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))/';
 
     private $mail_ical_parser;
 
@@ -131,6 +130,15 @@ class libcalendaring extends rcube_plugin
             $this->rc->output->set_env('libcal_settings', $this->load_settings());
             $this->include_script('libcalendaring.js');
             $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
+
+            $this->add_label(
+                'itipaccepted', 'itiptentative', 'itipdeclined',
+                'itipdelegated', 'expandattendeegroup', 'expandattendeegroupnodata',
+                'statusorganizer', 'statusaccepted', 'statusdeclined',
+                'statusdelegated', 'statusunknown', 'statusneeds-action',
+                'statustentative', 'statuscompleted', 'statusin-process',
+                'delegatedto', 'delegatedfrom', 'showmore'
+            );
         }
 
         if ($args['task'] == 'mail') {
@@ -197,18 +205,19 @@ class libcalendaring extends rcube_plugin
     public function load_settings()
     {
         $this->date_format_defaults();
-        $settings = array();
 
-        // configuration
-        $settings['date_format'] = (string)$this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format']);
-        $settings['time_format'] = (string)$this->rc->config->get('calendar_time_format', $this->defaults['calendar_time_format']);
-        $settings['date_short']  = (string)$this->rc->config->get('calendar_date_short', $this->defaults['calendar_date_short']);
-        $settings['date_long']   = (string)$this->rc->config->get('calendar_date_long', $this->defaults['calendar_date_long']);
+        $settings = array();
+        $keys     = array('date_format', 'time_format', 'date_short', 'date_long');
+
+        foreach ($keys as $key) {
+            $settings[$key] = (string)$this->rc->config->get('calendar_' . $key, $this->defaults['calendar_' . $key]);
+            $settings[$key] = str_replace('Y', 'y', $settings[$key]);
+        }
+
         $settings['dates_long']  = str_replace(' yyyy', '[ yyyy]', $settings['date_long']) . "{ '&mdash;' " . $settings['date_long'] . '}';
         $settings['first_day']   = (int)$this->rc->config->get('calendar_first_day', $this->defaults['calendar_first_day']);
-
-        $settings['timezone'] = $this->timezone_offset;
-        $settings['dst'] = $this->dst_active;
+        $settings['timezone']    = $this->timezone_offset;
+        $settings['dst']         = $this->dst_active;
 
         // localization
         $settings['days'] = array(
@@ -241,10 +250,6 @@ class libcalendaring extends rcube_plugin
         );
         $settings['today'] = $this->rc->gettext('today');
 
-        // define list of file types which can be displayed inline
-        // same as in program/steps/mail/show.inc
-        $settings['mimetypes'] = (array)$this->rc->config->get('client_mimetypes');
-
         return $settings;
     }
 
@@ -339,12 +344,12 @@ class libcalendaring extends rcube_plugin
     {
         unset($attrib['name']);
 
-        $input_value = new html_inputfield(array('name' => 'alarmvalue[]', 'class' => 'edit-alarm-value', 'size' => 3));
-        $input_date  = new html_inputfield(array('name' => 'alarmdate[]', 'class' => 'edit-alarm-date', 'size' => 10));
-        $input_time  = new html_inputfield(array('name' => 'alarmtime[]', 'class' => 'edit-alarm-time', 'size' => 6));
-        $select_type    = new html_select(array('name' => 'alarmtype[]', 'class' => 'edit-alarm-type', 'id' => $attrib['id']));
-        $select_offset  = new html_select(array('name' => 'alarmoffset[]', 'class' => 'edit-alarm-offset'));
-        $select_related = new html_select(array('name' => 'alarmrelated[]', 'class' => 'edit-alarm-related'));
+        $input_value    = new html_inputfield(array('name' => 'alarmvalue[]', 'class' => 'edit-alarm-value form-control input-group-prepend', 'size' => 3));
+        $input_date     = new html_inputfield(array('name' => 'alarmdate[]', 'class' => 'edit-alarm-date form-control', 'size' => 10));
+        $input_time     = new html_inputfield(array('name' => 'alarmtime[]', 'class' => 'edit-alarm-time form-control', 'size' => 6));
+        $select_type    = new html_select(array('name' => 'alarmtype[]', 'class' => 'edit-alarm-type form-control', 'id' => $attrib['id']));
+        $select_offset  = new html_select(array('name' => 'alarmoffset[]', 'class' => 'edit-alarm-offset form-control'));
+        $select_related = new html_select(array('name' => 'alarmrelated[]', 'class' => 'edit-alarm-related form-control'));
         $object_type    = $attrib['_type'] ?: 'event';
 
         $select_type->add($this->gettext('none'), '');
@@ -364,9 +369,10 @@ class libcalendaring extends rcube_plugin
         // pre-set with default values from user settings
         $preset = self::parse_alarm_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
         $hidden = array('style' => 'display:none');
-        $html = html::span('edit-alarm-set',
+
+        return html::span('edit-alarm-set',
             $select_type->show($this->rc->config->get('calendar_default_alarm_type', '')) . ' ' .
-            html::span(array('class' => 'edit-alarm-values', 'style' => 'display:none'),
+            html::span(array('class' => 'edit-alarm-values input-group', 'style' => 'display:none'),
                 $input_value->show($preset[0]) . ' ' .
                 $select_offset->show($preset[1]) . ' ' .
                 $select_related->show() . ' ' .
@@ -374,12 +380,6 @@ class libcalendaring extends rcube_plugin
                 $input_time->show('', $hidden)
             )
         );
-
-        // TODO: support adding more alarms
-        #$html .= html::a(array('href' => '#', 'id' => 'edit-alam-add', 'title' => $this->gettext('addalarm')),
-        #  $attrib['addicon'] ? html::img(array('src' => $attrib['addicon'], 'alt' => 'add')) : '(+)');
-
-        return $html;
     }
 
     /**
@@ -727,7 +727,8 @@ class libcalendaring extends rcube_plugin
                 'id'       => $alarm['id'],
                 'start'    => $alarm['start'] ? $this->adjust_timezone($alarm['start'])->format('c') : '',
                 'end'      => $alarm['end']   ? $this->adjust_timezone($alarm['end'])->format('c') : '',
-                'allDay'   => ($alarm['allday'] == 1)?true:false,
+                'allDay'   => $alarm['allday'] == 1,
+                'action'   => $alarm['action'],
                 'title'    => $alarm['title'],
                 'location' => $alarm['location'],
                 'calendar' => $alarm['calendar'],
@@ -771,77 +772,74 @@ class libcalendaring extends rcube_plugin
      */
     public function recurrence_text($rrule)
     {
-        // derive missing FREQ and INTERVAL from RDATE list
+        $limit     = 10;
+        $exdates   = array();
+        $format    = $this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format']);
+        $format    = self::to_php_date_format($format);
+        $format_fn = function($dt) use ($format) {
+            return rcmail::get_instance()->format_date($dt, $format);
+        };
+
+        if (is_array($rrule['EXDATE']) && !empty($rrule['EXDATE'])) {
+            $exdates = array_map($format_fn, $rrule['EXDATE']);
+        }
+
         if (empty($rrule['FREQ']) && !empty($rrule['RDATE'])) {
-            $first = $rrule['RDATE'][0];
-            $second = $rrule['RDATE'][1];
-            $third  = $rrule['RDATE'][2];
-            if (is_a($first, 'DateTime') && is_a($second, 'DateTime')) {
-                $diff = $first->diff($second);
-                foreach (array('y' => 'YEARLY', 'm' => 'MONTHLY', 'd' => 'DAILY') as $k => $freq) {
-                    if ($diff->$k != 0) {
-                        $rrule['FREQ'] = $freq;
-                        $rrule['INTERVAL'] = $diff->$k;
+            $rdates = array_map($format_fn, $rrule['RDATE']);
 
-                        // verify interval with next item
-                        if (is_a($third, 'DateTime')) {
-                            $diff2 = $second->diff($third);
-                            if ($diff2->$k != $diff->$k) {
-                                unset($rrule['INTERVAL']);
-                            }
-                        }
-                        break;
-                    }
-                }
+            if (!empty($exdates)) {
+                $rdates = array_diff($rdates, $exdates);
             }
-            if (!$rrule['INTERVAL']) {
-                $rrule['FREQ'] = 'RDATE';
+
+            if (count($rdates) > $limit) {
+                $rdates = array_slice($rdates, 0, $limit);
+                $more   = true;
             }
-            $rrule['UNTIL'] = end($rrule['RDATE']);
+
+            return $this->gettext('ondate') . ' ' . join(', ', $rdates)
+                . ($more ? '...' : '');
         }
 
-        $freq = sprintf('%s %d ', $this->gettext('every'), $rrule['INTERVAL']);
-        $details = '';
+        $output  = sprintf('%s %d ', $this->gettext('every'), $rrule['INTERVAL'] ?: 1);
+
         switch ($rrule['FREQ']) {
-            case 'DAILY':
-                $freq .= $this->gettext('days');
-                break;
-            case 'WEEKLY':
-                $freq .= $this->gettext('weeks');
-                break;
-            case 'MONTHLY':
-                $freq .= $this->gettext('months');
-                break;
-            case 'YEARLY':
-                $freq .= $this->gettext('years');
-                break;
-        }
-
-        if ($rrule['INTERVAL'] <= 1) {
-            $freq = $this->gettext(strtolower($rrule['FREQ']));
+        case 'DAILY':
+            $output .= $this->gettext('days');
+            break;
+        case 'WEEKLY':
+            $output .= $this->gettext('weeks');
+            break;
+        case 'MONTHLY':
+            $output .= $this->gettext('months');
+            break;
+        case 'YEARLY':
+            $output .= $this->gettext('years');
+            break;
         }
 
         if ($rrule['COUNT']) {
-            $until =  $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule['COUNT'])));
+            $until = $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule['COUNT'])));
         }
         else if ($rrule['UNTIL']) {
-            $until = $this->gettext('recurrencend') . ' ' . $this->rc->format_date($rrule['UNTIL'], self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format'])));
+            $until = $this->gettext('recurrencend') . ' ' . $this->rc->format_date($rrule['UNTIL'], $format);
         }
         else {
             $until = $this->gettext('forever');
         }
 
-        $except = '';
-        if (is_array($rrule['EXDATE']) && !empty($rrule['EXDATE'])) {
-          $format = self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format']));
-          $exdates = array_map(
-            function($dt) use ($format) { return rcmail::get_instance()->format_date($dt, $format); },
-            array_slice($rrule['EXDATE'], 0, 10)
-          );
-          $except = '; ' . $this->gettext('except') . ' ' . join(', ', $exdates);
+        $output .= ', ' . $until;
+
+        if (!empty($exdates)) {
+            if (count($exdates) > $limit) {
+                $exdates = array_slice($exdates, 0, $limit);
+                $more    = true;
+            }
+
+            $output  .= '; ' . $this->gettext('except') . ' ' . join(', ', $exdates)
+                . ($more ? '...' : '');
         }
 
-        return rtrim($freq . $details . ', ' . $until . $except);
+        return $output;
     }
 
     /**
@@ -852,30 +850,35 @@ class libcalendaring extends rcube_plugin
         switch ($attrib['part']) {
             // frequency selector
             case 'frequency':
-                $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency'));
+                $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency', 'class' => 'form-control'));
                 $select->add($this->gettext('never'),   '');
                 $select->add($this->gettext('daily'),   'DAILY');
                 $select->add($this->gettext('weekly'),  'WEEKLY');
                 $select->add($this->gettext('monthly'), 'MONTHLY');
                 $select->add($this->gettext('yearly'),  'YEARLY');
                 $select->add($this->gettext('rdate'),   'RDATE');
-                $html = html::label('edit-recurrence-frequency', $this->gettext('frequency')) . $select->show('');
+                $html = html::label(array('for' => 'edit-recurrence-frequency', 'class' => 'col-form-label col-sm-2'), $this->gettext('frequency'))
+                    . html::div('col-sm-10', $select->show(''));
                 break;
 
             // daily recurrence
             case 'daily':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-daily'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-daily', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('days')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-daily'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-daily', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('days')))));
                 break;
 
             // weekly recurrence form
             case 'weekly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-weekly'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-weekly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('weeks')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-weekly'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-weekly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('weeks')))));
+
                 // weekday selection
-                $daymap = array('sun','mon','tue','wed','thu','fri','sat');
+                $daymap   = array('sun','mon','tue','wed','thu','fri','sat');
                 $checkbox = new html_checkbox(array('name' => 'byday', 'class' => 'edit-recurrence-weekly-byday'));
-                $first = $this->rc->config->get('calendar_first_day', 1);
+                $first    = $this->rc->config->get('calendar_first_day', 1);
+
                 for ($weekdays = '', $j = $first; $j <= $first+6; $j++) {
                     $d = $j % 7;
                     $weekdays .= html::label(array('class' => 'weekday'),
@@ -883,13 +886,16 @@ class libcalendaring extends rcube_plugin
                         $this->gettext($daymap[$d])
                     ) . ' ';
                 }
-                $html .= html::div($attrib, html::label(null, $this->gettext('bydays')) . $weekdays);
+
+                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bydays'))
+                    . html::div('col-sm-10 form-control-plaintext', $weekdays));
                 break;
 
             // monthly recurrence form
             case 'monthly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-monthly'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-monthly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('months')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-monthly'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-monthly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('months')))));
 
                 $checkbox = new html_checkbox(array('name' => 'bymonthday', 'class' => 'edit-recurrence-monthly-bymonthday'));
                 for ($monthdays = '', $d = 1; $d <= 31; $d++) {
@@ -902,62 +908,81 @@ class libcalendaring extends rcube_plugin
                 $table = new html_table(array('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable'));
                 $table->add('label', html::label(null, $radio->show('BYMONTHDAY', array('value' => 'BYMONTHDAY')) . ' ' . $this->gettext('each')));
                 $table->add(null, $monthdays);
-                $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->gettext('onevery')));
-                $table->add(null, $this->rrule_selectors($attrib['part']));
+                $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->gettext('every')));
+                $table->add('recurrence-onevery', $this->rrule_selectors($attrib['part']));
 
-                $html .= html::div($attrib, $table->show());
+                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bydays'))
+                    . html::div('col-sm-10 form-control-plaintext', $table->show()));
                 break;
 
             // annually recurrence form
             case 'yearly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-yearly'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-yearly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('years')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-yearly'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-yearly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('years')))));
+
                 // month selector
                 $monthmap = array('','jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec');
                 $checkbox = new html_checkbox(array('name' => 'bymonth', 'class' => 'edit-recurrence-yearly-bymonth'));
+
                 for ($months = '', $m = 1; $m <= 12; $m++) {
                     $months .= html::label(array('class' => 'month'), $checkbox->show(null, array('value' => $m)) . $this->gettext($monthmap[$m]));
                     $months .= $m % 4 ? ' ' : html::br();
                 }
-                $html .= html::div($attrib + array('id' => 'edit-recurrence-yearly-bymonthblock'), $months);
 
-                // day rule selection
-                $html .= html::div($attrib, html::label(null, $this->gettext('onevery')) . $this->rrule_selectors($attrib['part'], '---'));
+                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bymonths'))
+                    . html::div('col-sm-10 form-control-plaintext',
+                        html::div(array('id' => 'edit-recurrence-yearly-bymonthblock'), $months)
+                        . html::div('recurrence-onevery', $this->rrule_selectors($attrib['part'], '---'))
+                    ));
                 break;
 
             // end of recurrence form
             case 'until':
-                $radio = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
-                $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times'));
-                $input = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => "10"));
+                $radio  = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
+                $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times', 'class' => 'form-control'));
+                $input  = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => '10', 'class' => 'form-control datepicker'));
 
                 $html = html::div('line first',
-                    html::label(null, $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever')) . ' ' .
-                        $this->gettext('forever'))
+                    $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever'))
+                        . ' ' . html::label('edit-recurrence-repeat-forever', $this->gettext('forever'))
                 );
 
-                $forntimes = $this->gettext(array(
-                    'name' => 'forntimes',
-                    'vars' => array('nr' => '%s'))
-                );
+                $label = $this->gettext('ntimes');
+                if (strpos($label, '$') === 0) {
+                    $label = str_replace('$n', '', $label);
+                    $group  = $select->show(1)
+                        . html::span('input-group-append', html::span('input-group-text', rcube::Q($label)));
+                }
+                else {
+                    $label = str_replace('$n', '', $label);
+                    $group  = html::span('input-group-prepend', html::span('input-group-text', rcube::Q($label)))
+                        . $select->show(1);
+                }
+
                 $html .= html::div('line',
-                    $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count', 'aria-label' => sprintf($forntimes, 'N'))) . ' ' .
-                        sprintf($forntimes, $select->show(1))
+                    $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count'))
+                        . ' ' . html::label('edit-recurrence-repeat-count', $this->gettext('for'))
+                        . ' ' . html::span('input-group', $group)
                 );
 
                 $html .= html::div('line',
-                    $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate'))) . ' ' .
-                        $this->gettext('untildate') . ' ' . $input->show('', array('aria-label' => $this->gettext('untilenddate')))
+                    $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate')))
+                        . ' ' . html::label('edit-recurrence-repeat-until', $this->gettext('untildate'))
+                        . ' ' . $input->show('', array('aria-label' => $this->gettext('untilenddate')))
                 );
 
-                $html = html::div($attrib, html::label(null, ucfirst($this->gettext('recurrencend'))) . $html);
+                $html = html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), ucfirst($this->gettext('recurrencend')))
+                    . html::div('col-sm-10', $html));
                 break;
 
             case 'rdate':
-                $ul = html::tag('ul', array('id' => 'edit-recurrence-rdates'), '');
-                $input = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10"));
+                $ul     = html::tag('ul', array('id' => 'edit-recurrence-rdates', 'class' => 'recurrence-rdates'), '');
+                $input  = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10", 'class' => 'form-control datepicker'));
                 $button = new html_inputfield(array('type' => 'button', 'class' => 'button add', 'value' => $this->gettext('addrdate')));
-                $html .= html::div($attrib, $ul . html::div('inputform', $input->show() . $button->show()));
+
+                $html = html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2', 'for' => 'edit-recurrence-rdate-input'), $this->gettext('bydates'))
+                    . html::div('col-sm-10', $ul . html::div('inputform', $input->show() . $button->show())));
                 break;
         }
 
@@ -980,7 +1005,7 @@ class libcalendaring extends rcube_plugin
     private function rrule_selectors($part, $noselect = null)
     {
         // rule selectors
-        $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix"));
+        $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix", 'class' => 'form-control'));
         if ($noselect) $select_prefix->add($noselect, '');
         $select_prefix->add(array(
                 $this->gettext('first'),
@@ -991,7 +1016,7 @@ class libcalendaring extends rcube_plugin
             ),
             array(1, 2, 3, 4, -1));
 
-        $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday"));
+        $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday", 'class' => 'form-control'));
         if ($noselect) $select_wday->add($noselect, '');
 
         $daymap = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday');
@@ -1009,8 +1034,9 @@ class libcalendaring extends rcube_plugin
      */
     public function to_client_recurrence($recurrence, $allday = false)
     {
-        if ($recurrence['UNTIL'])
+        if ($recurrence['UNTIL']) {
             $recurrence['UNTIL'] = $this->adjust_timezone($recurrence['UNTIL'], $allday)->format('c');
+        }
 
         // format RDATE values
         if (is_array($recurrence['RDATE'])) {
@@ -1053,259 +1079,6 @@ class libcalendaring extends rcube_plugin
     }
 
 
-    /*********  Attachments handling  *********/
-
-    /**
-     * Handler for attachment uploads
-     */
-    public function attachment_upload($session_key, $id_prefix = '')
-    {
-        // Upload progress update
-        if (!empty($_GET['_progress'])) {
-            $this->rc->upload_progress();
-        }
-
-        $recid = $id_prefix . rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-        $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC);
-
-        if (!is_array($_SESSION[$session_key]) || $_SESSION[$session_key]['id'] != $recid) {
-            $_SESSION[$session_key] = array();
-            $_SESSION[$session_key]['id'] = $recid;
-            $_SESSION[$session_key]['attachments'] = array();
-        }
-
-        // clear all stored output properties (like scripts and env vars)
-        $this->rc->output->reset();
-
-        if (is_array($_FILES['_attachments']['tmp_name'])) {
-            foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
-              // Process uploaded attachment if there is no error
-              $err = $_FILES['_attachments']['error'][$i];
-
-              if (!$err) {
-                $attachment = array(
-                    'path' => $filepath,
-                    'size' => $_FILES['_attachments']['size'][$i],
-                    'name' => $_FILES['_attachments']['name'][$i],
-                    'mimetype' => rcube_mime::file_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
-                    'group' => $recid,
-                );
-
-                $attachment = $this->rc->plugins->exec_hook('attachment_upload', $attachment);
-              }
-
-              if (!$err && $attachment['status'] && !$attachment['abort']) {
-                  $id = $attachment['id'];
-
-                  // store new attachment in session
-                  unset($attachment['status'], $attachment['abort']);
-                  $_SESSION[$session_key]['attachments'][$id] = $attachment;
-
-                  if (($icon = $_SESSION[$session_key . '_deleteicon']) && is_file($icon)) {
-                      $button = html::img(array(
-                          'src' => $icon,
-                          'alt' => $this->rc->gettext('delete')
-                      ));
-                  }
-                  else {
-                      $button = rcube::Q($this->rc->gettext('delete'));
-                  }
-
-                  $content = html::a(array(
-                      'href' => "#delete",
-                      'class' => 'delete',
-                      'onclick' => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", rcmail_output::JS_OBJECT_NAME, $id),
-                      'title' => $this->rc->gettext('delete'),
-                      'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
-                  ), $button);
-
-                  $content .= rcube::Q($attachment['name']);
-
-                  $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
-                      'html' => $content,
-                      'name' => $attachment['name'],
-                      'mimetype' => $attachment['mimetype'],
-                      'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
-                      'complete' => true), $uploadid);
-              }
-              else {  // upload failed
-                  if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-                    $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
-                        'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
-                  }
-                  else if ($attachment['error']) {
-                      $msg = $attachment['error'];
-                  }
-                  else {
-                      $msg = $this->rc->gettext('fileuploaderror');
-                  }
-
-                  $this->rc->output->command('display_message', $msg, 'error');
-                  $this->rc->output->command('remove_from_attachment_list', $uploadid);
-                }
-            }
-        }
-        else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            // if filesize exceeds post_max_size then $_FILES array is empty,
-            // show filesizeerror instead of fileuploaderror
-            if ($maxsize = ini_get('post_max_size'))
-                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
-                    'size' => $this->rc->show_bytes(parse_bytes($maxsize)))));
-            else
-                $msg = $this->rc->gettext('fileuploaderror');
-
-            $this->rc->output->command('display_message', $msg, 'error');
-            $this->rc->output->command('remove_from_attachment_list', $uploadid);
-        }
-
-        $this->rc->output->send('iframe');
-    }
-
-
-    /**
-     * Deliver an event/task attachment to the client
-     * (similar as in Roundcube core program/steps/mail/get.inc)
-     */
-    public function attachment_get($attachment)
-    {
-        ob_end_clean();
-
-        if ($attachment && $attachment['body']) {
-            // allow post-processing of the attachment body
-            $part = new rcube_message_part;
-            $part->filename  = $attachment['name'];
-            $part->size      = $attachment['size'];
-            $part->mimetype  = $attachment['mimetype'];
-
-            $plugin = $this->rc->plugins->exec_hook('message_part_get', array(
-                'body'     => $attachment['body'],
-                'mimetype' => strtolower($attachment['mimetype']),
-                'download' => !empty($_GET['_download']),
-                'part'     => $part,
-            ));
-
-            if ($plugin['abort'])
-                exit;
-
-            $mimetype = $plugin['mimetype'];
-            list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
-
-            $browser = $this->rc->output->browser;
-
-            // send download headers
-            if ($plugin['download']) {
-                header("Content-Type: application/octet-stream");
-                if ($browser->ie)
-                    header("Content-Type: application/force-download");
-            }
-            else if ($ctype_primary == 'text') {
-                header("Content-Type: text/$ctype_secondary");
-            }
-            else {
-                header("Content-Type: $mimetype");
-                header("Content-Transfer-Encoding: binary");
-            }
-
-            // display page, @TODO: support text/plain (and maybe some other text formats)
-            if ($mimetype == 'text/html' && empty($_GET['_download'])) {
-                $OUTPUT = new rcmail_html_page();
-                // @TODO: use washtml on $body
-                $OUTPUT->write($plugin['body']);
-            }
-            else {
-                // don't kill the connection if download takes more than 30 sec.
-                @set_time_limit(0);
-
-                $filename = $attachment['name'];
-                $filename = preg_replace('[\r\n]', '', $filename);
-
-                if ($browser->ie && $browser->ver < 7)
-                    $filename = rawurlencode(abbreviate_string($filename, 55));
-                else if ($browser->ie)
-                    $filename = rawurlencode($filename);
-                else
-                    $filename = addcslashes($filename, '"');
-
-                $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
-                header("Content-Disposition: $disposition; filename=\"$filename\"");
-
-                echo $plugin['body'];
-            }
-
-            exit;
-        }
-
-        // if we arrive here, the requested part was not found
-        header('HTTP/1.1 404 Not Found');
-        exit;
-    }
-
-    /**
-     * Show "loading..." page in attachment iframe
-     */
-    public function attachment_loading_page()
-    {
-        $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
-        $message = $this->rc->gettext('loadingdata');
-
-        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
-        print "<html>\n<head>\n"
-            . '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
-            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
-            . "</head>\n<body>\n$message\n</body>\n</html>";
-        exit;
-    }
-
-    /**
-     * Template object for attachment display frame
-     */
-    public function attachment_frame($attrib = array())
-    {
-        $mimetype = strtolower($this->attachment['mimetype']);
-        list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
-
-        $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary == 'text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
-
-        $this->rc->output->add_gui_object('attachmentframe', $attrib['id']);
-
-        return html::iframe($attrib);
-    }
-
-    /**
-     *
-     */
-    public function attachment_header($attrib = array())
-    {
-        $rcmail = rcmail::get_instance();
-        $dl_link = strtolower($attrib['downloadlink']) == 'true';
-        $dl_url = $this->rc->url(array('_frame' => null, '_download' => 1) + $_GET);
-
-        $table = new html_table(array('cols' => $dl_link ? 3 : 2));
-
-        if (!empty($this->attachment['name'])) {
-            $table->add('title', rcube::Q($this->rc->gettext('filename')));
-            $table->add('header', rcube::Q($this->attachment['name']));
-            if ($dl_link) {
-                $table->add('download-link', html::a($dl_url, rcube::Q($this->rc->gettext('download'))));
-            }
-        }
-
-        if (!empty($this->attachment['mimetype'])) {
-            $table->add('title', rcube::Q($this->rc->gettext('type')));
-            $table->add('header', rcube::Q($this->attachment['mimetype']));
-        }
-
-        if (!empty($this->attachment['size'])) {
-            $table->add('title', rcube::Q($this->rc->gettext('filesize')));
-            $table->add('header', rcube::Q($this->rc->show_bytes($this->attachment['size'])));
-        }
-
-        $this->rc->output->set_env('attachment_download_url', $dl_url);
-
-        return $table->show($attrib);
-    }
-
-
     /*********  iTip message detection  *********/
 
     /**
@@ -1314,11 +1087,11 @@ class libcalendaring extends rcube_plugin
     public function mail_message_load($p)
     {
         $this->ical_message = $p['object'];
-        $itip_part     = null;
+        $itip_part          = null;
 
         // check all message parts for .ics files
         foreach ((array)$this->ical_message->mime_parts as $part) {
-            if (self::part_is_vcalendar($part)) {
+            if (self::part_is_vcalendar($part, $this->ical_message)) {
                 if ($part->ctype_parameters['method'])
                     $itip_part = $part->mime_id;
                 else
@@ -1357,13 +1130,16 @@ class libcalendaring extends rcube_plugin
                     $this->mail_ical_parser->mime_id = $mime_id;
 
                     // store the message's sender address for comparisons
-                    $this->mail_ical_parser->sender = preg_match(self::$email_regex, $this->ical_message->headers->from, $m) ? $m[1] : '';
+                    $from = rcube_mime::decode_address_list($this->ical_message->headers->from, 1, true, null, true);
+                    $this->mail_ical_parser->sender = !empty($from) ? $from[1] : '';
+
                     if (!empty($this->mail_ical_parser->sender)) {
                         foreach ($this->mail_ical_parser->objects as $i => $object) {
                             $this->mail_ical_parser->objects[$i]['_sender'] = $this->mail_ical_parser->sender;
                             $this->mail_ical_parser->objects[$i]['_sender_utf'] = rcube_utils::idn_to_utf8($this->mail_ical_parser->sender);
                         }
                     }
+
                     break;
                 }
             }
@@ -1412,7 +1188,8 @@ class libcalendaring extends rcube_plugin
                 $object['_method'] = $parser->method;
 
             // store the message's sender address for comparisons
-            $object['_sender'] = preg_match(self::$email_regex, $headers->from, $m) ? $m[1] : '';
+            $from = rcube_mime::decode_address_list($headers->from, 1, true, null, true);
+            $object['_sender'] = !empty($from) ? $from[1] : '';
             $object['_sender_utf'] = rcube_utils::idn_to_utf8($object['_sender']);
 
             // check if this is an instance of a recurring event/task
@@ -1428,10 +1205,24 @@ class libcalendaring extends rcube_plugin
      * Checks if specified message part is a vcalendar data
      *
      * @param rcube_message_part Part object
+     * @param rcube_message      Message object
+     *
      * @return boolean True if part is of type vcard
      */
-    public static function part_is_vcalendar($part)
+    public static function part_is_vcalendar($part, $message = null)
     {
+        // First check if the message is "valid" (i.e. not multipart/report)
+        if ($message) {
+            $level = explode('.', $part->mime_id);
+
+            while (array_pop($level) !== null) {
+                $parent = $message->mime_parts[join('.', $level) ?: 0];
+                if ($parent->mimetype == 'multipart/report') {
+                    return false;
+                }
+            }
+        }
+
         return (
             in_array($part->mimetype, array('text/calendar', 'text/x-vcalendar', 'application/ics')) ||
             // Apple sends files as application/x-any (!?)
@@ -1482,18 +1273,23 @@ class libcalendaring extends rcube_plugin
      * Return the identifer for the given instance of a recurring event
      *
      * @param array Hash array with event properties
+     * @param bool  All-day flag from the main event
+     *
      * @return mixed Format string or null if identifier cannot be generated
      */
-    public static function recurrence_instance_identifier($event)
+    public static function recurrence_instance_identifier($event, $allday = null)
     {
         $instance_date = $event['recurrence_date'] ?: $event['start'];
 
         if ($instance_date && is_a($instance_date, 'DateTime')) {
-          $recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';
-          return $instance_date->format($recurrence_id_format);
-        }
+            // According to RFC5545 (3.8.4.4) RECURRENCE-ID format should
+            // be date/date-time depending on the main event type, not the exception
+            if ($allday === null) {
+                $allday = $event['allday'];
+            }
 
-        return null;
+            return $instance_date->format($allday ? 'Ymd' : 'Ymd\THis');
+        }
     }
 
 
@@ -1551,6 +1347,72 @@ class libcalendaring extends rcube_plugin
         $this->rc->output->command('plugin.expand_attendee_callback', $result);
     }
 
+    /**
+     * Merge attendees of the old and new event version
+     * with keeping current user and his delegatees status
+     *
+     * @param array &$new   New object data
+     * @param array $old    Old object data
+     * @param bool  $status New status of the current user
+     */
+    public function merge_attendees(&$new, $old, $status = null)
+    {
+        if (empty($status)) {
+            $emails    = $this->get_user_emails();
+            $delegates = array();
+            $attendees = array();
+
+            // keep attendee status of the current user
+            foreach ((array) $new['attendees'] as $i => $attendee) {
+                if (empty($attendee['email'])) {
+                    continue;
+                }
+
+                $attendees[] = $email = strtolower($attendee['email']);
+
+                if (in_array($email, $emails)) {
+                    foreach ($old['attendees'] as $_attendee) {
+                        if ($attendee['email'] == $_attendee['email']) {
+                            $new['attendees'][$i] = $_attendee;
+                            if ($_attendee['status'] == 'DELEGATED' && ($email = $_attendee['delegated-to'])) {
+                                $delegates[] = strtolower($email);
+                            }
+
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // make sure delegated attendee is not lost
+            foreach ($delegates as $delegatee) {
+                if (!in_array($delegatee, $attendees)) {
+                    foreach ((array) $old['attendees'] as $attendee) {
+                        if ($attendee['email'] && ($email = strtolower($attendee['email'])) && $email == $delegatee) {
+                            $new['attendees'][] = $attendee;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        // We also make sure that status of any attendee
+        // is not overriden by NEEDS-ACTION if it was already set
+        // which could happen if you work with shared events
+        foreach ((array) $new['attendees'] as $i => $attendee) {
+            if ($attendee['email'] && $attendee['status'] == 'NEEDS-ACTION') {
+                foreach ($old['attendees'] as $_attendee) {
+                    if ($attendee['email'] == $_attendee['email']) {
+                        $new['attendees'][$i]['status'] = $_attendee['status'];
+                        unset($new['attendees'][$i]['rsvp']);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
 
     /*********  Static utility functions  *********/
 
@@ -1605,6 +1467,8 @@ class libcalendaring extends rcube_plugin
     {
         // "dd.MM.yyyy HH:mm:ss" => "d.m.Y H:i:s"
         return strtr(strtr($from, array(
+            'YYYY' => 'Y',
+            'YY'   => 'y',
             'yyyy' => 'Y',
             'yy'   => 'y',
             'MMMM' => 'F',
diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index 938ccd07..b5e5e5a9 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -45,6 +45,14 @@ class libvcalendar implements Iterator
         'delegated-from'  => 'DELEGATED-FROM',
         'delegated-to'    => 'DELEGATED-TO',
         'schedule-status' => 'SCHEDULE-STATUS',
+        'schedule-agent'  => 'SCHEDULE-AGENT',
+        'sent-by'         => 'SENT-BY',
+    );
+    private $organizer_keymap = array(
+        'name'            => 'CN',
+        'schedule-status' => 'SCHEDULE-STATUS',
+        'schedule-agent'  => 'SCHEDULE-AGENT',
+        'sent-by'         => 'SENT-BY',
     );
     private $iteratorkey = 0;
     private $charset;
@@ -543,6 +551,10 @@ class libvcalendar implements Iterator
                     $attendee['role'] = 'ORGANIZER';
                     $attendee['status'] = 'ACCEPTED';
                     $event['organizer'] = $attendee;
+
+                    if (array_key_exists('schedule-agent', $attendee)) {
+                        $schedule_agent = $attendee['schedule-agent'];
+                    }
                 }
                 else if ($attendee['email'] != $event['organizer']['email']) {
                     $event['attendees'][] = $attendee;
@@ -591,8 +603,8 @@ class libvcalendar implements Iterator
                 $event['allday'] = true;
             }
 
-            // all-day events may lack the DTEND property
-            if ($event['allday'] && empty($event['end'])) {
+            // events may lack the DTEND property, set it to DTSTART (RFC5545 3.6.1)
+            if (empty($event['end'])) {
                 $event['end'] = clone $event['start'];
             }
             // shift end-date by one day (except Thunderbird)
@@ -702,6 +714,12 @@ class libvcalendar implements Iterator
             $event['end'] = clone $event['start'];
         }
 
+        // T2531: Remember SCHEDULE-AGENT in custom property to properly
+        // support event updates via CalDAV when SCHEDULE-AGENT=CLIENT is used
+        if (isset($schedule_agent)) {
+            $event['x-custom'][] = array('SCHEDULE-AGENT', $schedule_agent);
+        }
+
         // minimal validation
         if (empty($event['uid']) || ($event['_type'] == 'event' && empty($event['start']) != empty($event['end']))) {
             throw new VObject\ParseException('Object validation failed: missing mandatory object properties');
@@ -745,7 +763,7 @@ class libvcalendar implements Iterator
 
                 // skip dupes
                 if ($seen[$value.':'.$fbtype]++)
-                    continue;
+                    break;
 
                 foreach ($periods as $period) {
                     // Every period is formatted as [start]/[end]. The start is an
@@ -996,8 +1014,8 @@ class libvcalendar implements Iterator
         $ve->UID = $event['uid'];
 
         // set DTSTAMP according to RFC 5545, 3.8.7.2.
-        $dtstamp = !empty($event['changed']) && !empty($this->method) ? $event['changed'] : new DateTime('now', new \DateTimeZone('UTC'));
-        $ve->add($this->datetime_prop($cal, 'DTSTAMP', $dtstamp, true));
+        $dtstamp = !empty($event['changed']) && empty($this->method) ? $event['changed'] : new DateTime('now', new \DateTimeZone('UTC'));
+        $ve->DTSTAMP = $this->datetime_prop($cal, 'DTSTAMP', $dtstamp, true);
 
         // all-day events end the next day
         if ($event['allday'] && !empty($event['end'])) {
@@ -1054,18 +1072,15 @@ class libvcalendar implements Iterator
 
             // add EXDATEs each one per line (for Thunderbird Lightning)
             if (is_array($exdates)) {
-                foreach ($exdates as $ex) {
-                    if ($ex instanceof \DateTime) {
-                        $exd = clone $event['start'];
-                        $exd->setDate($ex->format('Y'), $ex->format('n'), $ex->format('j'));
-                        $exd->setTimeZone(new \DateTimeZone('UTC'));
-                        $ve->add($this->datetime_prop($cal, 'EXDATE', $exd, true));
+                foreach ($exdates as $exdate) {
+                    if ($exdate instanceof DateTime) {
+                        $ve->add($this->datetime_prop($cal, 'EXDATE', $exdate));
                     }
                 }
             }
             // add RDATEs
-            if (!empty($rdates)) {
-                foreach ((array)$rdates as $rdate) {
+            if (is_array($rdates)) {
+                foreach ($rdates as $rdate) {
                     $ve->add($this->datetime_prop($cal, 'RDATE', $rdate));
                 }
             }
@@ -1158,6 +1173,13 @@ class libvcalendar implements Iterator
             $ve->add($va);
         }
 
+        // Find SCHEDULE-AGENT
+        foreach ((array)$event['x-custom'] as $prop) {
+            if ($prop[0] === 'SCHEDULE-AGENT') {
+                $schedule_agent = $prop[1];
+            }
+        }
+
         foreach ((array)$event['attendees'] as $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
                 if (empty($event['organizer']))
@@ -1166,14 +1188,26 @@ class libvcalendar implements Iterator
             else if (!empty($attendee['email'])) {
                 if (isset($attendee['rsvp']))
                     $attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
-                $ve->add('ATTENDEE', 'mailto:' . $attendee['email'],
-                    array_filter(self::map_keys($attendee, $this->attendee_keymap)));
+
+                $mailto   = $attendee['email'];
+                $attendee = array_filter(self::map_keys($attendee, $this->attendee_keymap));
+
+                if ($schedule_agent !== null && !isset($attendee['SCHEDULE-AGENT'])) {
+                    $attendee['SCHEDULE-AGENT'] = $schedule_agent;
+                }
+
+                $ve->add('ATTENDEE', 'mailto:' . $mailto, $attendee);
             }
         }
 
         if ($event['organizer']) {
-            $ve->add('ORGANIZER', 'mailto:' . $event['organizer']['email'],
-                array_filter(self::map_keys($event['organizer'], array('name' => 'CN', 'schedule-status' => 'SCHEDULE-STATUS'))));
+            $organizer = array_filter(self::map_keys($event['organizer'], $this->organizer_keymap));
+
+            if ($schedule_agent !== null && !isset($organizer['SCHEDULE-AGENT'])) {
+                $organizer['SCHEDULE-AGENT'] = $schedule_agent;
+            }
+
+            $ve->add('ORGANIZER', 'mailto:' . $event['organizer']['email'], $organizer);
         }
 
         foreach ((array)$event['url'] as $url) {
diff --git a/plugins/libcalendaring/localization/bg_BG.inc b/plugins/libcalendaring/localization/bg_BG.inc
index 52501513..1050f007 100644
--- a/plugins/libcalendaring/localization/bg_BG.inc
+++ b/plugins/libcalendaring/localization/bg_BG.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab calendaring utilities plugin
  *
@@ -7,9 +6,18 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
-
 $labels['until'] = 'до';
 $labels['alarmemailoption'] = 'Електронна поща';
+$labels['frequency'] = 'Повтори';
+$labels['bydates'] = 'On';
+$labels['bymonths'] = 'On';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Организатор';
+$labels['statustentative'] = 'Предварително';
+$labels['statusneeds-action'] = 'Нужно е действие';
+$labels['statusunknown'] = 'Няма информация';
+$labels['statuscompleted'] = 'Завършен';
+$labels['statusin-process'] = 'В процес';
 $labels['itipcancellation'] = 'Отказано:';
 $labels['itipreply'] = 'Отговор на';
 $labels['itipaccepted'] = 'Приемане';
@@ -18,8 +26,9 @@ $labels['itipdeclined'] = 'Отхвърляне';
 $labels['itipsubjectaccepted'] = '"$title" беше прието от $name';
 $labels['itipsubjectdeclined'] = '"$title" беше отхвърлено от $name';
 $labels['updateattendeestatus'] = 'Подновяване на статусът на участника';
+$labels['acceptinvitation'] = 'Приемате ли тази покана?';
 $labels['youhaveaccepted'] = 'Вие сте приели тази покана';
 $labels['importtocalendar'] = 'Запазване в моя календар';
 $labels['removefromcalendar'] = 'Премахване от моя календар';
 $labels['savingdata'] = 'Запазване на данни...';
-
+$labels['savein'] = 'Save in';
diff --git a/plugins/libcalendaring/localization/ca_ES.inc b/plugins/libcalendaring/localization/ca_ES.inc
index 76f5a377..72b25937 100644
--- a/plugins/libcalendaring/localization/ca_ES.inc
+++ b/plugins/libcalendaring/localization/ca_ES.inc
@@ -11,5 +11,12 @@ $labels['at'] = 'a';
 $labels['alarmemailoption'] = 'Email';
 $labels['frequency'] = 'Repeteix';
 $labels['recurrencend'] = 'fins';
-$labels['itipdelegated'] = 'Delegate';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organitzador';
+$labels['statustentative'] = 'Provisional';
+$labels['statusneeds-action'] = 'Necessita una acció';
+$labels['statusunknown'] = 'Desconegut';
+$labels['statuscompleted'] = 'Completat';
+$labels['statusin-process'] = 'En procés';
 $labels['savingdata'] = 'S\'estan desant les dades...';
+$labels['savein'] = 'Save in';
diff --git a/plugins/libcalendaring/localization/cs_CZ.inc b/plugins/libcalendaring/localization/cs_CZ.inc
index d76c1aba..9be95cd0 100644
--- a/plugins/libcalendaring/localization/cs_CZ.inc
+++ b/plugins/libcalendaring/localization/cs_CZ.inc
@@ -22,7 +22,6 @@ $labels['trigger-D'] = 'dnů před';
 $labels['trigger+M'] = 'minut po';
 $labels['trigger+H'] = 'hodin po';
 $labels['trigger+D'] = 'dnů po';
-$labels['triggerattime'] = 'v čase';
 $labels['addalarm'] = 'Přidat upozornění';
 $labels['removealarm'] = 'Odstranit upozornění';
 $labels['alarmtitle'] = 'Blížící se události';
@@ -47,7 +46,9 @@ $labels['days'] = 'den (dny)';
 $labels['weeks'] = 'týden (týdny)';
 $labels['months'] = 'měsíc(e/ů)';
 $labels['years'] = 'rok(y/ů) v:';
+$labels['bydates'] = 'On';
 $labels['bydays'] = 'On';
+$labels['bymonths'] = 'On';
 $labels['untildate'] = 'do';
 $labels['each'] = 'Každý';
 $labels['onevery'] = 'Vždy v';
@@ -55,7 +56,7 @@ $labels['onsamedate'] = 'Ve stejné datum';
 $labels['forever'] = 'trvale';
 $labels['recurrencend'] = 'do';
 $labels['untilenddate'] = 'až do';
-$labels['forntimes'] = 'jen $nrkrát';
+$labels['forntimes'] = 'jen $nrkrát'; // old
 $labels['first'] = 'první';
 $labels['second'] = 'druhý';
 $labels['third'] = 'třetí';
@@ -64,6 +65,15 @@ $labels['last'] = 'poslední';
 $labels['dayofmonth'] = 'Den v měsíci';
 $labels['addrdate'] = 'Add repeat date';
 $labels['except'] = 'vyjma';
+$labels['statusorganizer'] = 'Pořadatel';
+$labels['statusaccepted'] = 'Přijato';
+$labels['statustentative'] = 'Nezávazně';
+$labels['statusdeclined'] = 'Odmítnuto';
+$labels['statusdelegated'] = 'Svěřeno';
+$labels['statusneeds-action'] = 'Potřebuje činnost';
+$labels['statusunknown'] = 'Neznámý';
+$labels['statuscompleted'] = 'Hotovo';
+$labels['statusin-process'] = 'Rozpracováno';
 $labels['itipinvitation'] = 'Pozvání na událost';
 $labels['itipupdate'] = 'Aktualizace události';
 $labels['itipcancellation'] = 'Zrušeno:';
@@ -125,6 +135,7 @@ $labels['delegateto'] = 'Pověřit';
 $labels['delegatersvpme'] = 'Informovat o aktualizacích tohoto případu';
 $labels['delegateinvalidaddress'] = 'Zadejte, prosím, platnou e-mailovou adresu tohoto zástupce.';
 $labels['savingdata'] = 'Ukládám data...';
+$labels['savein'] = 'Uložit do';
 $labels['expandattendeegroup'] = 'Nahradit členy skupiny';
 $labels['expandattendeegroupnodata'] = 'Tuto skupinu se nepodařilo nahradit. Nenalezeni žádní členové.';
 $labels['expandattendeegrouperror'] = 'Tuto skupinu se nepodařilo nahradit. Možná má příliš mnoho členů.';
diff --git a/plugins/libcalendaring/localization/da_DK.inc b/plugins/libcalendaring/localization/da_DK.inc
index a7a11036..5cd29654 100644
--- a/plugins/libcalendaring/localization/da_DK.inc
+++ b/plugins/libcalendaring/localization/da_DK.inc
@@ -10,8 +10,10 @@ $labels['until'] = 'indtil';
 $labels['at'] = 'ved';
 $labels['alarmemail'] = 'Afsend e-post';
 $labels['alarmdisplay'] = 'Vis besked';
+$labels['alarmaudio'] = 'Afspil lyd';
 $labels['alarmdisplayoption'] = 'Besked';
 $labels['alarmemailoption'] = 'E-post';
+$labels['alarmaudiooption'] = 'Lyd';
 $labels['alarmat'] = 'per $datetime';
 $labels['trigger@'] = 'per dato';
 $labels['trigger-M'] = 'minutter før';
@@ -20,6 +22,8 @@ $labels['trigger-D'] = 'dage før';
 $labels['trigger+M'] = 'minutter efter';
 $labels['trigger+H'] = 'timer efter';
 $labels['trigger+D'] = 'dage efter';
+$labels['addalarm'] = 'Tilføj alarm';
+$labels['removealarm'] = 'Fjern alarm';
 $labels['alarmtitle'] = 'Kommende arrangementer';
 $labels['dismissall'] = 'Afvis alle';
 $labels['dismiss'] = 'Afvis';
@@ -37,19 +41,23 @@ $labels['daily'] = 'dagligt';
 $labels['weekly'] = 'ugentligt';
 $labels['monthly'] = 'månedligt';
 $labels['yearly'] = 'årligt';
+$labels['rdate'] = 'på datoer';
 $labels['every'] = 'Hver';
 $labels['days'] = 'dag(e)';
 $labels['weeks'] = 'uge(r)';
 $labels['months'] = 'måned(er)';
 $labels['years'] = 'år i:';
+$labels['bydates'] = 'Per';
 $labels['bydays'] = 'Per';
+$labels['bymonths'] = 'Per';
 $labels['untildate'] = 'den';
 $labels['each'] = 'Hver';
 $labels['onevery'] = 'På hver';
 $labels['onsamedate'] = 'På samme dato';
 $labels['forever'] = 'for altid';
 $labels['recurrencend'] = 'indtil';
-$labels['forntimes'] = 'for $nr gang(e)';
+$labels['untilenddate'] = 'indtil datoen';
+$labels['forntimes'] = 'for $nr gang(e)'; // old
 $labels['first'] = 'første';
 $labels['second'] = 'anden';
 $labels['third'] = 'tredje';
@@ -57,6 +65,15 @@ $labels['fourth'] = 'fjerde';
 $labels['last'] = 'sidste';
 $labels['dayofmonth'] = 'Dag på måneden';
 $labels['addrdate'] = 'Add repeat date';
+$labels['except'] = 'undtagen';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Accepteret';
+$labels['statustentative'] = 'Forsøgsvis';
+$labels['statusdeclined'] = 'Afvist';
+$labels['statusneeds-action'] = 'Needs action';
+$labels['statusunknown'] = 'Ukendt';
+$labels['statuscompleted'] = 'Completed';
+$labels['statusin-process'] = 'In process';
 $labels['itipinvitation'] = 'Invitation til';
 $labels['itipupdate'] = 'Opdatering per';
 $labels['itipcancellation'] = 'Aflyst:';
@@ -65,11 +82,26 @@ $labels['itipaccepted'] = 'Acceptér';
 $labels['itiptentative'] = 'Måske';
 $labels['itipdeclined'] = 'Afvis';
 $labels['itipdelegated'] = 'Delegér';
+$labels['itipneeds-action'] = 'Udsæt';
+$labels['itipcomment'] = 'Dit svar';
+$labels['itipeditresponse'] = 'Angiv en svartekst';
+$labels['itipsendercomment'] = 'Afsenders kommentar:';
+$labels['itipsuppressreply'] = 'Undlad at sende et svar';
+$labels['itipobjectnotfound'] = 'Objektet som denne besked refererer til, blev ikke fundet i din konto.';
 $labels['itipsubjectaccepted'] = '"$title" er blevet accepteret af $name';
 $labels['itipsubjecttentative'] = '"$title" er blevet forsøgsvist accepteret af $name';
 $labels['itipsubjectdeclined'] = '"$title" af blevet afvist af $name';
+$labels['itipsubjectin-process'] = '"$title" er en igangværende proces hos $name';
+$labels['itipsubjectcompleted'] = '"$title" blev fuldført af $name';
+$labels['itipsubjectcancel'] = 'Din deltagelse i "$title" er blevet annulleret';
+$labels['itipsubjectdelegated'] = '"$title" er blevet delegeret af $name';
+$labels['itipsubjectdelegatedto'] = '"$title" er blevet delegeret til dig af $name';
+$labels['itipnewattendee'] = 'Dette er et svar fra en ny deltager';
 $labels['updateattendeestatus'] = 'Opdatér status for deltagere';
 $labels['acceptinvitation'] = 'Vil du acceptere denne invitation?';
+$labels['acceptattendee'] = 'Acceptér deltager';
+$labels['declineattendee'] = 'Afvis deltager';
+$labels['declineattendeeconfirm'] = 'Indtast en besked til den afviste deltager (valgfrit):';
 $labels['rsvpmodeall'] = 'Hele serien';
 $labels['rsvpmodecurrent'] = 'Kun denne forekomst';
 $labels['rsvpmodefuture'] = 'Denne og fremtidige forekomster';
@@ -80,6 +112,38 @@ $labels['itipmessagefutureoccurrence'] = 'Denne besked refererer til denne og al
 $labels['youhaveaccepted'] = 'Du har accepteret denne invitation';
 $labels['youhavetentative'] = 'Du har forsøgsvist accepteret denne invitation';
 $labels['youhavedeclined'] = 'Du har afvist denne invitation';
+$labels['youhavedelegated'] = 'Du har delegeret denne invitation';
+$labels['youhavein-process'] = 'Du arbejder på denne tildelte opgave';
+$labels['youhavecompleted'] = 'Du har afsluttet denne tildelte opgave';
+$labels['youhaveneeds-action'] = 'Dit svar til denne invitation afventes stadig';
+$labels['youhavepreviouslyaccepted'] = 'Du har tidligere accepteret denne invitation';
+$labels['youhavepreviouslytentative'] = 'Du har tidligere accepteret denne invitation tentativt';
+$labels['youhavepreviouslydeclined'] = 'Du har tidligere afvist denne invitation';
+$labels['youhavepreviouslydelegated'] = 'Du har tidligere delegeret denne invitation';
+$labels['youhavepreviouslyin-process'] = 'Du har tidligere rapporteret, at du vil arbejdet på denne tildelte opgave';
+$labels['youhavepreviouslycompleted'] = 'Du har tidligere afsluttet denne tildelte opgave';
+$labels['youhavepreviouslyneeds-action'] = 'Du svar til denne invitation afventes stadig';
+$labels['attendeeaccepted'] = 'Deltageren er blevet accepteret';
+$labels['attendeetentative'] = 'Deltageren er tentativt blevet accepteret';
+$labels['attendeedeclined'] = 'Deltageren er blevet afvist';
+$labels['attendeedelegated'] = 'Deltageren har delegeret til $delegatedto';
+$labels['attendeein-process'] = 'Deltager i under behandling';
+$labels['attendeecompleted'] = 'Deltageren er afsluttet';
+$labels['notanattendee'] = 'Du har ikke opført en deltager for dette objekt';
+$labels['outdatedinvitation'] = 'Denne invitation er blevet erstattet af en nyere version';
 $labels['importtocalendar'] = 'Gem i min kalender';
 $labels['removefromcalendar'] = 'Fjern fra min kalender';
+$labels['updatemycopy'] = 'Opdatér min kopi';
+$labels['openpreview'] = 'Åbn forhåndsvisning';
+$labels['deleteobjectconfirm'] = 'Sikker på at du vil slette dette objekt?';
+$labels['declinedeleteconfirm'] = 'Vil du også slette dette afviste objekt fra din konto?';
+$labels['delegateinvitation'] = 'Delegér invitation';
+$labels['delegateto'] = 'Delegér til';
+$labels['delegatersvpme'] = 'Hold mig orienteret om opdateringer vedrørende denne hændelse';
+$labels['delegateinvalidaddress'] = 'Angiv venligst en gyldig e-mailadresse for den delegerede';
 $labels['savingdata'] = 'Gemmer data...';
+$labels['savein'] = 'Gem i';
+$labels['expandattendeegroup'] = 'Substituér med gruppemedlemmer';
+$labels['expandattendeegroupnodata'] = 'Kan ikke substituere denne gruppe. Fandt ikke medlemmer.';
+$labels['expandattendeegrouperror'] = 'Kan ikke substituere denne gruppe. Den kan indeholde for mange medlemmer.';
+$labels['expandattendeegroupsizelimit'] = 'Denne gruppe indeholder for mange medlemmer til substituering.';
diff --git a/plugins/libcalendaring/localization/de_CH.inc b/plugins/libcalendaring/localization/de_CH.inc
index 08e2f430..50d1e5f1 100644
--- a/plugins/libcalendaring/localization/de_CH.inc
+++ b/plugins/libcalendaring/localization/de_CH.inc
@@ -10,16 +10,32 @@ $labels['until'] = 'bis';
 $labels['at'] = 'um';
 $labels['alarmemail'] = 'E-Mail senden';
 $labels['alarmdisplay'] = 'Nachricht anzeigen';
+$labels['alarmaudio'] = 'Audio abspielen';
 $labels['alarmdisplayoption'] = 'Nachricht';
 $labels['alarmemailoption'] = 'E-Mail';
+$labels['alarmaudiooption'] = 'Audio';
 $labels['alarmat'] = 'um $datetime';
-$labels['trigger@'] = 'genau um';
+$labels['trigger@'] = 'genau am';
 $labels['trigger-M'] = 'Minuten davor';
 $labels['trigger-H'] = 'Stunden davor';
 $labels['trigger-D'] = 'Tage davor';
 $labels['trigger+M'] = 'Minuten danach';
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
+$labels['triggerend-M'] = 'Minuten vor dem Ende';
+$labels['triggerend-H'] = 'Stunden vor dem Ende';
+$labels['triggerend-D'] = 'Tage vor dem Ende';
+$labels['triggerend+M'] = 'Minuten nach dem Ende';
+$labels['triggerend+H'] = 'Stunden nach dem Ende';
+$labels['triggerend+D'] = 'Tage nach dem Ende';
+$labels['trigger0'] = 'um exakt';
+$labels['triggerattime'] = 'zur Startzeit';
+$labels['triggerattimeend'] = 'zur Endzeit';
+$labels['relatedstart'] = 'Beginn';
+$labels['relatedendevent'] = 'Ende';
+$labels['relatedendtask'] = 'Frist';
+$labels['addalarm'] = 'Erinnerung hinzufügen';
+$labels['removealarm'] = 'Erinnerung entfernen';
 $labels['alarmtitle'] = 'Anstehende Termine';
 $labels['dismissall'] = 'Alle ignorieren';
 $labels['dismiss'] = 'Ignorieren';
@@ -30,26 +46,30 @@ $labels['repeatinhrs'] = 'Wiederholung in $hrs Stunden';
 $labels['repeattomorrow'] = 'Wiederholung morgen';
 $labels['repeatinweek'] = 'Wiederholung in einer Woche';
 $labels['showmore'] = 'Mehr anzeigen...';
+$labels['recurring'] = 'Wiederholungen';
 $labels['frequency'] = 'Wiederholung';
 $labels['never'] = 'nie';
 $labels['daily'] = 'täglich';
 $labels['weekly'] = 'wöchentlich';
 $labels['monthly'] = 'monatlich';
 $labels['yearly'] = 'jährlich';
-$labels['rdate'] = 'on dates';
+$labels['rdate'] = 'genau um';
 $labels['every'] = 'Alle';
 $labels['days'] = 'Tag(e)';
 $labels['weeks'] = 'Woche(n)';
 $labels['months'] = 'Monat(e)';
 $labels['years'] = 'Jahre(e) im:';
+$labels['bydates'] = 'Am';
 $labels['bydays'] = 'Am';
+$labels['bymonths'] = 'Am';
 $labels['untildate'] = 'am';
 $labels['each'] = 'Jeden';
 $labels['onevery'] = 'An jedem';
 $labels['onsamedate'] = 'Am gleichen Tag';
 $labels['forever'] = 'unendlich';
 $labels['recurrencend'] = 'bis';
-$labels['forntimes'] = '$nr Wiederholungen';
+$labels['untilenddate'] = 'bis am';
+$labels['forntimes'] = '$nr Wiederholungen'; // old
 $labels['first'] = 'erster';
 $labels['second'] = 'zweiter';
 $labels['third'] = 'dritter';
@@ -57,6 +77,16 @@ $labels['fourth'] = 'vierter';
 $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
 $labels['addrdate'] = 'Datum hinzufügen';
+$labels['except'] = 'ausser';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statustentative'] = 'Mit Vorbehalt';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusdelegated'] = 'Delegiert';
+$labels['statusneeds-action'] = 'Braucht Aktion';
+$labels['statusunknown'] = 'Unbekannt';
+$labels['statuscompleted'] = 'Abgeschlossen';
+$labels['statusin-process'] = 'In Bearbeitung';
 $labels['itipinvitation'] = 'Einladung zu';
 $labels['itipupdate'] = 'Aktialisiert:';
 $labels['itipcancellation'] = 'Abgesagt:';
@@ -65,17 +95,68 @@ $labels['itipaccepted'] = 'Akzeptieren';
 $labels['itiptentative'] = 'Mit Vorbehalt';
 $labels['itipdeclined'] = 'Ablehnen';
 $labels['itipdelegated'] = 'Vertreter';
+$labels['itipneeds-action'] = 'Aufschieben';
+$labels['itipcomment'] = 'Ihre Antwort';
+$labels['itipeditresponse'] = 'Antwort eingeben';
+$labels['itipsendercomment'] = 'Kommentar des Absenders:';
+$labels['itipsuppressreply'] = 'Keine Antwort senden';
+$labels['itipobjectnotfound'] = 'Das Objekt auf welches sich diese Nachricht bezieht, wurde in Ihrem Konto nicht gefunden.';
 $labels['itipsubjectaccepted'] = 'Einladung zu "$title" wurde von $name angenommen';
 $labels['itipsubjecttentative'] = 'Einladung zu "$title" wurde von $name mit Vorbehalt angenommen';
 $labels['itipsubjectdeclined'] = 'Einladung zu "$title" wurde von $name abgelehnt';
+$labels['itipsubjectin-process'] = '"$title" ist nun in Bearbeitung von $name';
+$labels['itipsubjectcompleted'] = '"$title" wurde vom $name fertiggestellt';
+$labels['itipsubjectcancel'] = 'Ihre Teilnahme in "$title" wurde aufgehoben';
+$labels['itipsubjectdelegated'] = '"$title" wurde durch $name delegiert';
+$labels['itipsubjectdelegatedto'] = '"$title" wurde durch $name an Sie delegiert';
+$labels['itipnewattendee'] = 'Dies ist eine Antwort von einem neuen Teilnehmer';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
 $labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
+$labels['acceptattendee'] = 'Teilnehmer akzeptieren';
+$labels['declineattendee'] = 'Teilnehmer ablehnen';
+$labels['declineattendeeconfirm'] = 'Nachricht an den abgelehnten Teilnehmer verfassen (optional):';
+$labels['rsvpmodeall'] = 'Die gesamte Reihe';
+$labels['rsvpmodecurrent'] = 'Nur dieses Ereignis';
+$labels['rsvpmodefuture'] = 'Dieses und zukünftige Ereignisse';
+$labels['itipsingleoccurrence'] = 'Dieses ist eine <em>einzelne Wiederholung</emaußerhalb einer Serie von Ereignissen';
+$labels['itipfutureoccurrence'] = 'Bezieht sich auf <em>diese and alle zukünftigen Wiederholungen</emeiner Serie von Ereignissen';
+$labels['itipmessagesingleoccurrence'] = 'Diese Nachricht bezieht sich nur auf eine einzelne Wiederholung';
+$labels['itipmessagefutureoccurrence'] = 'Diese Nachricht bezieht sich auf diese und alle zukünftigen Wiederholungen';
 $labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
 $labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
 $labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
+$labels['youhavedelegated'] = 'Sie haben diese Einladung abgelehnt';
+$labels['youhavein-process'] = 'Sie arbeiten an dieser Aufgabe';
+$labels['youhavecompleted'] = 'Sie haben diese Aufgabe erledigt';
+$labels['youhaveneeds-action'] = 'Ihre Antwort auf diese Einladung ist noch ausstehend';
+$labels['youhavepreviouslyaccepted'] = 'Sie haben diese Einladung zuvor angenommen';
+$labels['youhavepreviouslytentative'] = 'Sie haben diese Einladung zuvor mit Vorbehalt angenommen';
+$labels['youhavepreviouslydeclined'] = 'Sie haben diese Einladung zuvor abgelehnt';
+$labels['youhavepreviouslydelegated'] = 'Sie haben diese Einladung zuvor delegiert';
+$labels['youhavepreviouslyin-process'] = 'Sie haben diese Aufgabe zuvor als In Bearbeitung gemeldet';
+$labels['youhavepreviouslycompleted'] = 'Sie haben diese Einladung zuvor erledigt';
+$labels['youhavepreviouslyneeds-action'] = 'Ihre Antwort auf diese Einladung ist noch ausstehend';
+$labels['attendeeaccepted'] = 'Teilnehmer hat akzeptiert';
+$labels['attendeetentative'] = 'Teilnehmer hat mit Vorbehalt akzeptiert';
+$labels['attendeedeclined'] = 'Teilnehmer hat abgelehnt';
+$labels['attendeedelegated'] = 'Teilnehmer hat an $delegatedto delegiert';
+$labels['attendeein-process'] = 'Teilnehmer arbeitet an dieser Aufgabe';
+$labels['attendeecompleted'] = 'Teilnehmer hat die Aufgabe erledigt';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
+$labels['outdatedinvitation'] = 'Diese Einladung wurde durch eine neuere Version ersetzt';
 $labels['importtocalendar'] = 'In Kalender übernehmen';
 $labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
+$labels['updatemycopy'] = 'Meine Kopie aktualisieren';
+$labels['openpreview'] = 'Vorschau öffnen';
 $labels['deleteobjectconfirm'] = 'Möchten Sie dieses Objekt wirklich löschen?';
 $labels['declinedeleteconfirm'] = 'Soll das abgelehnte Objekt ebenfalls aus Ihrem Konto gelöscht werden?';
+$labels['delegateinvitation'] = 'Einladung delegieren';
+$labels['delegateto'] = 'Delegieren an';
+$labels['delegatersvpme'] = 'Informiere mich über Aktualisierungen dieses Termins';
+$labels['delegateinvalidaddress'] = 'Geben Sie eine gültige E-Mail-Adresse für den Delegierten ein';
 $labels['savingdata'] = 'Speichere...';
+$labels['savein'] = 'Speichern in';
+$labels['expandattendeegroup'] = 'Mit Gruppenmitgliedern ersetzen';
+$labels['expandattendeegroupnodata'] = 'Diese Gruppe konnte nicht ersetzt werden. Keine Gruppenmitglieder gefunden.';
+$labels['expandattendeegrouperror'] = 'Diese Gruppe konnte nicht ersetzt werden. Sie hat möglicherweise zuviele Mitglieder.';
+$labels['expandattendeegroupsizelimit'] = 'Die Gruppe hat zuviele Mitglieder und konnte deshalb nicht ersetzt werden.';
diff --git a/plugins/libcalendaring/localization/de_DE.inc b/plugins/libcalendaring/localization/de_DE.inc
index a5196432..680c2ec4 100644
--- a/plugins/libcalendaring/localization/de_DE.inc
+++ b/plugins/libcalendaring/localization/de_DE.inc
@@ -15,14 +15,25 @@ $labels['alarmdisplayoption'] = 'Nachricht';
 $labels['alarmemailoption'] = 'E-Mail';
 $labels['alarmaudiooption'] = 'Audio';
 $labels['alarmat'] = 'um $datetime';
-$labels['trigger@'] = 'genau um';
+$labels['trigger@'] = 'genau am';
 $labels['trigger-M'] = 'Minuten davor';
 $labels['trigger-H'] = 'Stunden davor';
 $labels['trigger-D'] = 'Tage davor';
 $labels['trigger+M'] = 'Minuten danach';
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
-$labels['triggerattime'] = 'um exakt';
+$labels['triggerend-M'] = 'Minuten vor dem Ende';
+$labels['triggerend-H'] = 'Stunden vor dem Ende';
+$labels['triggerend-D'] = 'Tage vor dem Ende';
+$labels['triggerend+M'] = 'Minuten nach dem Ende';
+$labels['triggerend+H'] = 'Stunden nach dem Ende';
+$labels['triggerend+D'] = 'Tage nach dem Ende';
+$labels['trigger0'] = 'um exakt';
+$labels['triggerattime'] = 'zur Startzeit';
+$labels['triggerattimeend'] = 'zur Endzeit';
+$labels['relatedstart'] = 'Beginn';
+$labels['relatedendevent'] = 'Ende';
+$labels['relatedendtask'] = 'Fällig';
 $labels['addalarm'] = 'Erinnerung hinzufügen';
 $labels['removealarm'] = 'Erinnerung entfernen';
 $labels['alarmtitle'] = 'Anstehende Termine';
@@ -42,13 +53,15 @@ $labels['daily'] = 'täglich';
 $labels['weekly'] = 'wöchentlich';
 $labels['monthly'] = 'monatlich';
 $labels['yearly'] = 'jährlich';
-$labels['rdate'] = 'on dates';
+$labels['rdate'] = 'genau am';
 $labels['every'] = 'Alle';
 $labels['days'] = 'Tag(e)';
 $labels['weeks'] = 'Woche(n)';
 $labels['months'] = 'Monat(e)';
 $labels['years'] = 'Jahre(e) im:';
+$labels['bydates'] = 'Am';
 $labels['bydays'] = 'Am';
+$labels['bymonths'] = 'Am';
 $labels['untildate'] = 'am';
 $labels['each'] = 'Jeden';
 $labels['onevery'] = 'An jedem';
@@ -56,7 +69,7 @@ $labels['onsamedate'] = 'Am gleichen Tag';
 $labels['forever'] = 'unendlich';
 $labels['recurrencend'] = 'bis';
 $labels['untilenddate'] = 'bis am';
-$labels['forntimes'] = '$nr Wiederholungen';
+$labels['forntimes'] = '$nr Wiederholungen'; // old
 $labels['first'] = 'erster';
 $labels['second'] = 'zweiter';
 $labels['third'] = 'dritter';
@@ -65,6 +78,15 @@ $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
 $labels['addrdate'] = 'Datum hinzufügen';
 $labels['except'] = 'ausser';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statustentative'] = 'Mit Vorbehalt';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusdelegated'] = 'Delegiert';
+$labels['statusneeds-action'] = 'Braucht Aktion';
+$labels['statusunknown'] = 'Unbekannt';
+$labels['statuscompleted'] = 'Abgeschlossen';
+$labels['statusin-process'] = 'In Bearbeitung';
 $labels['itipinvitation'] = 'Einladung zu';
 $labels['itipupdate'] = 'Aktialisiert:';
 $labels['itipcancellation'] = 'Abgesagt:';
@@ -96,6 +118,10 @@ $labels['declineattendeeconfirm'] = 'Nachricht an den abgelehnten Teilnehmer ver
 $labels['rsvpmodeall'] = 'Die gesamte Reihe';
 $labels['rsvpmodecurrent'] = 'Nur dieses Ereignis';
 $labels['rsvpmodefuture'] = 'Dieses und zukünftige Ereignisse';
+$labels['itipsingleoccurrence'] = 'Dieses ist eine <em>einzelne Wiederholung</em> einer Serie von Ereignissen';
+$labels['itipfutureoccurrence'] = 'Bezieht sich auf <em>diese and alle zukünftigen Wiederholungen</em> einer Serie von Ereignissen';
+$labels['itipmessagesingleoccurrence'] = 'Diese Nachricht bezieht sich nur auf eine einzelne Wiederholung';
+$labels['itipmessagefutureoccurrence'] = 'Diese Nachricht bezieht sich auf diese und alle zukünftigen Wiederholungen';
 $labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
 $labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
 $labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
@@ -129,6 +155,7 @@ $labels['delegateto'] = 'Delegieren an';
 $labels['delegatersvpme'] = 'Informiere mich über Aktualisierungen dieses Termins';
 $labels['delegateinvalidaddress'] = 'Geben Sie eine gültige E-Mail-Adresse für den Delegierten ein';
 $labels['savingdata'] = 'Speichere...';
+$labels['savein'] = 'Speichern in';
 $labels['expandattendeegroup'] = 'Mit Gruppenmitgliedern ersetzen';
 $labels['expandattendeegroupnodata'] = 'Diese Gruppe konnte nicht ersetzt werden. Keine Gruppenmitglieder gefunden.';
 $labels['expandattendeegrouperror'] = 'Diese Gruppe konnte nicht ersetzt werden. Sie hat möglicherweise zuviele Mitglieder.';
diff --git a/plugins/libcalendaring/localization/el.inc b/plugins/libcalendaring/localization/el.inc
new file mode 100644
index 00000000..6ffd524d
--- /dev/null
+++ b/plugins/libcalendaring/localization/el.inc
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['until'] = 'μέχρι';
+$labels['alarmemail'] = 'Αποστολή αλληλογραφίας';
+$labels['alarmdisplay'] = 'Εμφάνιση μηνύματος';
+$labels['alarmaudio'] = 'Αναπαραγωγή ήχου';
+$labels['alarmdisplayoption'] = 'Μήνυμα';
+$labels['alarmemailoption'] = 'Ηλεκτρονική αλληλογραφία';
+$labels['alarmaudiooption'] = 'Ήχος';
+$labels['trigger-H'] = 'ώρες πριν';
+$labels['trigger+M'] = 'λεπτά μετά';
+$labels['trigger+H'] = 'ώρες μετά';
+$labels['trigger+D'] = 'ημέρες μετά';
+$labels['triggerend-M'] = 'λεπτά πριν το τέλος';
+$labels['triggerend-H'] = 'ώρες πριν το τέλος';
+$labels['triggerend-D'] = 'ημέρες πριν το τέλος';
+$labels['triggerend+M'] = 'λεπτά πριν το τέλος';
+$labels['triggerend+D'] = 'ημέρες μετά το τέλος';
+$labels['frequency'] = 'Επανάληψη';
+$labels['recurrencend'] = 'μέχρι';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Οργανωτής';
+$labels['statuscompleted'] = 'Ολοκληρώθηκε';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
diff --git a/plugins/libcalendaring/localization/en_US.inc b/plugins/libcalendaring/localization/en_US.inc
index b0a3585e..e1b55518 100644
--- a/plugins/libcalendaring/localization/en_US.inc
+++ b/plugins/libcalendaring/localization/en_US.inc
@@ -70,7 +70,9 @@ $labels['days'] = 'day(s)';
 $labels['weeks'] = 'week(s)';
 $labels['months'] = 'month(s)';
 $labels['years'] = 'year(s)';
+$labels['bydates'] = 'On';
 $labels['bydays'] = 'On';
+$labels['bymonths'] = 'On';
 $labels['untildate'] = 'the';
 $labels['each'] = 'Each';
 $labels['onevery'] = 'On every';
@@ -78,7 +80,9 @@ $labels['onsamedate'] = 'On the same date';
 $labels['forever'] = 'forever';
 $labels['recurrencend'] = 'until';
 $labels['untilenddate'] = 'until date';
-$labels['forntimes'] = 'for $nr time(s)';
+$labels['forntimes'] = 'for $nr time(s)'; // old
+$labels['ntimes'] = '$n time(s)';
+$labels['for'] = 'for';
 $labels['first'] = 'first';
 $labels['second'] = 'second';
 $labels['third'] = 'third';
@@ -88,6 +92,16 @@ $labels['dayofmonth'] = 'Day of month';
 $labels['addrdate'] = 'Add repeat date';
 $labels['except'] = 'except';
 
+$labels['statusorganizer'] = 'Organizer';
+$labels['statusaccepted'] = 'Accepted';
+$labels['statustentative'] = 'Tentative';
+$labels['statusdeclined'] = 'Declined';
+$labels['statusdelegated'] = 'Delegated';
+$labels['statusneeds-action'] = 'Needs action';
+$labels['statusunknown'] = 'Unknown';
+$labels['statuscompleted'] = 'Completed';
+$labels['statusin-process'] = 'In process';
+
 // itip related labels
 $labels['itipinvitation'] = 'Invitation to';
 $labels['itipupdate'] = 'Update of';
@@ -165,8 +179,11 @@ $labels['delegateinvitation'] = 'Delegate Invitation';
 $labels['delegateto'] = 'Delegate to';
 $labels['delegatersvpme'] = 'Keep me informed about updates of this incidence';
 $labels['delegateinvalidaddress'] = 'Please enter a valid email address for the delegate';
+$labels['delegatedto'] = 'Delegated to:';
+$labels['delegatedfrom'] = 'Delegated from:';
 
 $labels['savingdata'] = 'Saving data...';
+$labels['savein'] = 'Save in';
 
 // attendees labels
 $labels['expandattendeegroup'] = 'Substitute with group members';
diff --git a/plugins/libcalendaring/localization/es_AR.inc b/plugins/libcalendaring/localization/es_AR.inc
index d50f5082..7cf60486 100644
--- a/plugins/libcalendaring/localization/es_AR.inc
+++ b/plugins/libcalendaring/localization/es_AR.inc
@@ -22,7 +22,18 @@ $labels['trigger-D'] = 'días antes';
 $labels['trigger+M'] = 'minutos después';
 $labels['trigger+H'] = 'horas después';
 $labels['trigger+D'] = 'días después';
-$labels['triggerattime'] = 'en hora';
+$labels['triggerend-M'] = 'minutos antes de finalizar';
+$labels['triggerend-H'] = 'horas antes de finalizar';
+$labels['triggerend-D'] = 'días antes de finalizar';
+$labels['triggerend+M'] = 'minutos después de finalizar';
+$labels['triggerend+H'] = 'horas después de finalizar';
+$labels['triggerend+D'] = 'días despues de finalizar';
+$labels['trigger0'] = 'en hora';
+$labels['triggerattime'] = 'en hora de inicio';
+$labels['triggerattimeend'] = 'en hora de finalización';
+$labels['relatedstart'] = 'inicio';
+$labels['relatedendevent'] = 'fin';
+$labels['relatedendtask'] = 'fecha de vencimiento';
 $labels['addalarm'] = 'Agregar alarma';
 $labels['removealarm'] = 'Eliminar alarma';
 $labels['alarmtitle'] = 'Eventos próximos';
@@ -35,6 +46,7 @@ $labels['repeatinhrs'] = 'Repetir en $hrs horas';
 $labels['repeattomorrow'] = 'Repetir mañana';
 $labels['repeatinweek'] = 'Repetir en una semana';
 $labels['showmore'] = 'Mostrar más...';
+$labels['recurring'] = 'Repite';
 $labels['frequency'] = 'Repetir';
 $labels['never'] = 'nunca';
 $labels['daily'] = 'diariamente';
@@ -47,7 +59,9 @@ $labels['days'] = 'día(s)';
 $labels['weeks'] = 'semana(s)';
 $labels['months'] = 'mes(es)';
 $labels['years'] = 'año(s)';
+$labels['bydates'] = 'En';
 $labels['bydays'] = 'En';
+$labels['bymonths'] = 'En';
 $labels['untildate'] = 'el';
 $labels['each'] = 'Cada';
 $labels['onevery'] = 'En cada';
@@ -55,7 +69,9 @@ $labels['onsamedate'] = 'En la misma fecha';
 $labels['forever'] = 'para siempre';
 $labels['recurrencend'] = 'hasta';
 $labels['untilenddate'] = 'hasta la fecha';
-$labels['forntimes'] = 'por $nr veces';
+$labels['forntimes'] = 'por $nr veces'; // old
+$labels['ntimes'] = '$n veces';
+$labels['for'] = 'para';
 $labels['first'] = 'primero';
 $labels['second'] = 'segundo';
 $labels['third'] = 'tercero';
@@ -64,6 +80,15 @@ $labels['last'] = 'último';
 $labels['dayofmonth'] = 'Día del mes';
 $labels['addrdate'] = 'Agregar fecha de repetición';
 $labels['except'] = 'excepto';
+$labels['statusorganizer'] = 'Organizador';
+$labels['statusaccepted'] = 'Aceptado';
+$labels['statustentative'] = 'Tentativo';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusdelegated'] = 'Delegado';
+$labels['statusneeds-action'] = 'Necesita acción';
+$labels['statusunknown'] = 'Desconocido';
+$labels['statuscompleted'] = 'Completo';
+$labels['statusin-process'] = 'En proceso';
 $labels['itipinvitation'] = 'Invitación a';
 $labels['itipupdate'] = 'Actualizar de';
 $labels['itipcancellation'] = 'Cancelado:';
@@ -84,12 +109,21 @@ $labels['itipsubjectdeclined'] = '"$title" ha sido rechazado por $name';
 $labels['itipsubjectin-process'] = '"$title" está en proceso por $name';
 $labels['itipsubjectcompleted'] = '"$title" fue completado por $name';
 $labels['itipsubjectcancel'] = 'Su participación en "$title" ha sido cancelada';
+$labels['itipsubjectdelegated'] = '"$title" ha sido delegado por $name';
+$labels['itipsubjectdelegatedto'] = '"$title" ha sido delegado a usted por $name';
 $labels['itipnewattendee'] = 'Esta es una respuesta de un nuevo participante';
 $labels['updateattendeestatus'] = 'Actualizar el estado del participante';
 $labels['acceptinvitation'] = '¿Acepta esta invitación?';
 $labels['acceptattendee'] = 'Aceptar participante';
 $labels['declineattendee'] = 'Rechazar participante';
 $labels['declineattendeeconfirm'] = 'Ingresar un mensaje para el participante rechazado (opcional):';
+$labels['rsvpmodeall'] = 'La serie completa';
+$labels['rsvpmodecurrent'] = 'Esta ocurrencia sola';
+$labels['rsvpmodefuture'] = 'Esta y futuras ocurrencias';
+$labels['itipsingleoccurrence'] = 'Esta es una <em>ocurrencia individual</em> de una serie de eventos';
+$labels['itipfutureoccurrence'] = 'Refiere a <em>esta y todas las futuras ocurrencias</em> de una serie de eventos';
+$labels['itipmessagesingleoccurrence'] = 'El mensaje solamente refiere a esta ocurrencia individual';
+$labels['itipmessagefutureoccurrence'] = 'El mensaje refiere a esta y todas las futuras ocurrencias';
 $labels['youhaveaccepted'] = 'Ha aceptado esta invitación';
 $labels['youhavetentative'] = 'Ha aceptado tentativamente esta invitación';
 $labels['youhavedeclined'] = 'Ha rechazado esta invitación';
@@ -118,7 +152,14 @@ $labels['updatemycopy'] = 'Actualizar mi copia';
 $labels['openpreview'] = 'Abrir Vista Preliminar';
 $labels['deleteobjectconfirm'] = 'Confirme que desea eliminar este objeto';
 $labels['declinedeleteconfirm'] = '¿Quiere también eliminar este objeto rechazado de su cuenta?';
+$labels['delegateinvitation'] = 'Delegar Invitación';
+$labels['delegateto'] = 'Delegar a';
+$labels['delegatersvpme'] = 'Mantenerme informado acerca de las actualizaciones de esta incidencia';
+$labels['delegateinvalidaddress'] = 'Por favor, ingrese una dirección de correo electrónico válida para la delegación';
+$labels['delegatedto'] = 'Delegado a:';
+$labels['delegatedfrom'] = 'Delegado de:';
 $labels['savingdata'] = 'Guardando...';
+$labels['savein'] = 'Guardar en';
 $labels['expandattendeegroup'] = 'Sustituir con miembros del grupo';
 $labels['expandattendeegroupnodata'] = 'No se puede sustituir este grupo. No se encontraron miembros.';
 $labels['expandattendeegrouperror'] = 'No se puede sustituir este grupo. Puede contener demasiados miembros.';
diff --git a/plugins/libcalendaring/localization/es_ES.inc b/plugins/libcalendaring/localization/es_ES.inc
index 32b089a0..9b14f85e 100644
--- a/plugins/libcalendaring/localization/es_ES.inc
+++ b/plugins/libcalendaring/localization/es_ES.inc
@@ -10,8 +10,10 @@ $labels['until'] = 'until';
 $labels['at'] = 'at';
 $labels['alarmemail'] = 'Send Email';
 $labels['alarmdisplay'] = 'Show message';
+$labels['alarmaudio'] = 'Reproducir sonido';
 $labels['alarmdisplayoption'] = 'Message';
 $labels['alarmemailoption'] = 'Correo electrónico';
+$labels['alarmaudiooption'] = 'Sonido';
 $labels['alarmat'] = 'at $datetime';
 $labels['trigger@'] = 'on date';
 $labels['trigger-M'] = 'minutes before';
@@ -20,6 +22,20 @@ $labels['trigger-D'] = 'days before';
 $labels['trigger+M'] = 'minutes after';
 $labels['trigger+H'] = 'hours after';
 $labels['trigger+D'] = 'days after';
+$labels['triggerend-M'] = 'minutos para finalizar';
+$labels['triggerend-H'] = 'horas para finalizar';
+$labels['triggerend-D'] = 'días para finalizar';
+$labels['triggerend+M'] = 'minutos tras finalizar';
+$labels['triggerend+H'] = 'horas tras finalizar';
+$labels['triggerend+D'] = 'días tras finalizar';
+$labels['trigger0'] = 'a tiempo';
+$labels['triggerattime'] = 'al iniciar';
+$labels['triggerattimeend'] = 'al finalizar';
+$labels['relatedstart'] = 'iniciar';
+$labels['relatedendevent'] = 'fin';
+$labels['relatedendtask'] = 'Plazo estipulado';
+$labels['addalarm'] = 'Añadir alarma';
+$labels['removealarm'] = 'Eliminar alarma';
 $labels['alarmtitle'] = 'Upcoming events';
 $labels['dismissall'] = 'Dismiss all';
 $labels['dismiss'] = 'Dismiss';
@@ -30,6 +46,7 @@ $labels['repeatinhrs'] = 'Repeat in $hrs hours';
 $labels['repeattomorrow'] = 'Repeat tomorrow';
 $labels['repeatinweek'] = 'Repeat in a week';
 $labels['showmore'] = 'Show more...';
+$labels['recurring'] = 'Repeticiones';
 $labels['frequency'] = 'Repeat';
 $labels['never'] = 'never';
 $labels['daily'] = 'daily';
@@ -41,14 +58,18 @@ $labels['every'] = 'Every';
 $labels['days'] = 'day(s)';
 $labels['weeks'] = 'week(s)';
 $labels['months'] = 'month(s)';
+$labels['years'] = 'año(s)';
+$labels['bydates'] = 'On';
 $labels['bydays'] = 'On';
+$labels['bymonths'] = 'On';
 $labels['untildate'] = 'the';
 $labels['each'] = 'Each';
 $labels['onevery'] = 'On every';
 $labels['onsamedate'] = 'On the same date';
 $labels['forever'] = 'forever';
 $labels['recurrencend'] = 'until';
-$labels['forntimes'] = 'for $nr time(s)';
+$labels['untilenddate'] = 'hasta la fecha';
+$labels['forntimes'] = 'for $nr time(s)'; // old
 $labels['first'] = 'first';
 $labels['second'] = 'second';
 $labels['third'] = 'third';
@@ -56,4 +77,86 @@ $labels['fourth'] = 'fourth';
 $labels['last'] = 'last';
 $labels['dayofmonth'] = 'Day of month';
 $labels['addrdate'] = 'Add repeat date';
+$labels['except'] = 'excepto';
+$labels['statusorganizer'] = 'Organizador';
+$labels['statusaccepted'] = 'Aceptada';
+$labels['statustentative'] = 'Provisional';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusdelegated'] = 'Delgado';
+$labels['statusneeds-action'] = 'Necesita acción';
+$labels['statusunknown'] = 'Desconocido';
+$labels['statuscompleted'] = 'Realizado';
+$labels['statusin-process'] = 'En proceso';
+$labels['itipinvitation'] = 'Invitación para';
+$labels['itipupdate'] = 'Actualización de';
+$labels['itipcancellation'] = 'Cancelado:';
+$labels['itipreply'] = 'Responder a';
+$labels['itipaccepted'] = 'Aceptar';
+$labels['itiptentative'] = 'Tal vez';
+$labels['itipdeclined'] = 'Declinar';
+$labels['itipdelegated'] = 'Delegado';
+$labels['itipneeds-action'] = 'Posponer';
+$labels['itipcomment'] = 'Su respuesta';
+$labels['itipeditresponse'] = 'Introducir un texto de respuesta';
+$labels['itipsendercomment'] = 'Comentario del remitente:';
+$labels['itipsuppressreply'] = 'No enviar una respuesta';
+$labels['itipobjectnotfound'] = 'El objeto referido en este mensaje no se encontró en su cuenta.';
+$labels['itipsubjectaccepted'] = '$name ha aceptado el "$title"';
+$labels['itipsubjecttentative'] = '$name aceptado provisionalmente el "$title"';
+$labels['itipsubjectdeclined'] = '$name ha declinado el "$title"';
+$labels['itipsubjectin-process'] = '$name está procesando el "$title"';
+$labels['itipsubjectcompleted'] = '$name ha completado el "$title"';
+$labels['itipsubjectcancel'] = 'Se ha cancelado su participación en "$title';
+$labels['itipsubjectdelegated'] = '$name ha delegado el "$title"';
+$labels['itipsubjectdelegatedto'] = '$name ha delegado en ti el "$title"';
+$labels['itipnewattendee'] = 'Esta es la respuesta de un nuevo participante';
+$labels['updateattendeestatus'] = 'Actualizar el estado del participante';
+$labels['acceptinvitation'] = '¿Acepta esta inviitación?';
+$labels['acceptattendee'] = 'Aceptar participante';
+$labels['declineattendee'] = 'Declinar participante';
+$labels['declineattendeeconfirm'] = 'Introduzca un mensaje para el participante rechazado (opcional):';
+$labels['rsvpmodeall'] = 'Las series completas';
+$labels['rsvpmodecurrent'] = 'Este caso sólo';
+$labels['rsvpmodefuture'] = 'Este y los futuros casos';
+$labels['itipsingleoccurrence'] = 'Se trata de un <em>caso aislado</ em> en una serie de eventos';
+$labels['itipfutureoccurrence'] = 'Se refiere a <em>este y todos los casos futuros</ em> en una serie de eventos';
+$labels['itipmessagesingleoccurrence'] = 'El mensaje solo hace referencia a este caso aislado';
+$labels['itipmessagefutureoccurrence'] = 'El mensaje hace referencia a este y todos los casos futuros';
+$labels['youhaveaccepted'] = 'Ha aceptado esta invitación';
+$labels['youhavetentative'] = 'Ha aceptado esta invitación provisionalmente';
+$labels['youhavedeclined'] = 'Ha declinado esta invitación';
+$labels['youhavedelegated'] = 'Ha delegado esta invitación';
+$labels['youhavein-process'] = 'Está trabajando en esta asignación';
+$labels['youhavecompleted'] = 'Ha completado esta asignación';
+$labels['youhaveneeds-action'] = 'Sigue pendiente su respuesta a esta convitación';
+$labels['youhavepreviouslyaccepted'] = 'Ha aceptado esta invitación anteriormente';
+$labels['youhavepreviouslytentative'] = 'Ya ha aceptado esta invitación provisionalmente';
+$labels['youhavepreviouslydeclined'] = 'Ha declinado esta invitación anteriormente';
+$labels['youhavepreviouslydelegated'] = 'Ha adelegado esta invitación anteriormente';
+$labels['youhavepreviouslyin-process'] = 'Ya ha informado anteriormente para trabajar en esta asignación';
+$labels['youhavepreviouslycompleted'] = 'Ya ha completado esta asignación';
+$labels['youhavepreviouslyneeds-action'] = 'Sigue pendiente su respuesta a esta invitación';
+$labels['attendeeaccepted'] = 'El participante ha aceptado';
+$labels['attendeetentative'] = 'El participante ha aceptado provisionalmente';
+$labels['attendeedeclined'] = 'El participante ha declinado';
+$labels['attendeedelegated'] = 'El participante ha delegado en $delegatedto';
+$labels['attendeein-process'] = 'El participante está en proceso';
+$labels['attendeecompleted'] = 'El participante ha completado';
+$labels['notanattendee'] = 'Usted no está en la lista como asistente de este proyecto';
+$labels['outdatedinvitation'] = 'Esta invitación se ha sustituido por una nueva versión';
+$labels['importtocalendar'] = 'Guardar en mi calendario';
+$labels['removefromcalendar'] = 'Eliminar de mi calendario';
+$labels['updatemycopy'] = 'Actualizar mi copia';
+$labels['openpreview'] = 'Abrir vista previa';
+$labels['deleteobjectconfirm'] = '¿Esta seguro de eliminar  este objeto?';
+$labels['declinedeleteconfirm'] = '¿También desea eliminar este objeto declinado del calendario?';
+$labels['delegateinvitation'] = 'Delegar invitación';
+$labels['delegateto'] = 'Delegar en';
+$labels['delegatersvpme'] = 'Mantenerme informado de las actualizaciones de esta incidencia';
+$labels['delegateinvalidaddress'] = 'Introduzca una dirección de correo electrónico válida para delegar';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['savein'] = 'Guardar en';
+$labels['expandattendeegroup'] = 'Sustituir con los miembros del grupo';
+$labels['expandattendeegroupnodata'] = 'No puede sustituirse este grupo. No se han encontrado miembros.';
+$labels['expandattendeegrouperror'] = 'No puede sustituirse este grupo. Tal vez tenga demasiados miembros.';
+$labels['expandattendeegroupsizelimit'] = 'Este grupo contiene demasiados miembros que sustituir.';
diff --git a/plugins/libcalendaring/localization/et_EE.inc b/plugins/libcalendaring/localization/et_EE.inc
index 291c160d..7507bf6d 100644
--- a/plugins/libcalendaring/localization/et_EE.inc
+++ b/plugins/libcalendaring/localization/et_EE.inc
@@ -6,55 +6,49 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
-$labels['until'] = 'until';
-$labels['at'] = 'at';
-$labels['alarmemail'] = 'Send Email';
-$labels['alarmdisplay'] = 'Show message';
-$labels['alarmdisplayoption'] = 'Message';
+$labels['until'] = 'kuni';
+$labels['alarmemail'] = 'Saada kiri';
+$labels['alarmdisplay'] = 'Näita sõnumit';
+$labels['alarmaudio'] = 'Esita heli';
+$labels['alarmdisplayoption'] = 'Sõnum';
 $labels['alarmemailoption'] = 'E-post';
-$labels['alarmat'] = 'at $datetime';
-$labels['trigger@'] = 'on date';
-$labels['trigger-M'] = 'minutes before';
-$labels['trigger-H'] = 'hours before';
-$labels['trigger-D'] = 'days before';
-$labels['trigger+M'] = 'minutes after';
-$labels['trigger+H'] = 'hours after';
-$labels['trigger+D'] = 'days after';
-$labels['alarmtitle'] = 'Upcoming events';
-$labels['dismissall'] = 'Dismiss all';
-$labels['dismiss'] = 'Dismiss';
-$labels['snooze'] = 'Snooze';
-$labels['repeatinmin'] = 'Repeat in $min minutes';
-$labels['repeatinhr'] = 'Repeat in 1 hour';
-$labels['repeatinhrs'] = 'Repeat in $hrs hours';
-$labels['repeattomorrow'] = 'Repeat tomorrow';
-$labels['repeatinweek'] = 'Repeat in a week';
-$labels['showmore'] = 'Show more...';
-$labels['frequency'] = 'Repeat';
-$labels['never'] = 'never';
-$labels['daily'] = 'daily';
-$labels['weekly'] = 'weekly';
-$labels['monthly'] = 'monthly';
-$labels['yearly'] = 'annually';
-$labels['rdate'] = 'on dates';
-$labels['every'] = 'Every';
-$labels['days'] = 'day(s)';
-$labels['weeks'] = 'week(s)';
-$labels['months'] = 'month(s)';
-$labels['bydays'] = 'On';
-$labels['untildate'] = 'the';
-$labels['each'] = 'Each';
-$labels['onevery'] = 'On every';
-$labels['onsamedate'] = 'On the same date';
-$labels['forever'] = 'forever';
-$labels['recurrencend'] = 'until';
-$labels['forntimes'] = 'for $nr time(s)';
-$labels['first'] = 'first';
-$labels['second'] = 'second';
-$labels['third'] = 'third';
-$labels['fourth'] = 'fourth';
-$labels['last'] = 'last';
-$labels['dayofmonth'] = 'Day of month';
-$labels['addrdate'] = 'Add repeat date';
-$labels['itipdelegated'] = 'Delegate';
-$labels['savingdata'] = 'Saving data...';
+$labels['alarmaudiooption'] = 'Heli';
+$labels['trigger-M'] = 'minutit enne';
+$labels['trigger-H'] = 'tundi enne';
+$labels['trigger-D'] = 'päeva enne';
+$labels['trigger+M'] = 'minutit pärast';
+$labels['trigger+H'] = 'tundi pärast';
+$labels['trigger+D'] = 'päeva pärast';
+$labels['addalarm'] = 'Lisa alarm';
+$labels['dismissall'] = 'Eira kõiki';
+$labels['dismiss'] = 'Eira';
+$labels['snooze'] = 'Lükka edasi';
+$labels['showmore'] = 'Näita rohkem...';
+$labels['recurring'] = 'Kordused';
+$labels['frequency'] = 'Kordamine';
+$labels['never'] = 'mitte kunagi';
+$labels['bydates'] = 'On';
+$labels['bymonths'] = 'On';
+$labels['forever'] = 'igavesti';
+$labels['recurrencend'] = 'kuni';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organiseerija';
+$labels['statusaccepted'] = 'Vastu võetud';
+$labels['statusdeclined'] = 'Tagasi lükatud';
+$labels['statusunknown'] = 'Teadmata';
+$labels['statuscompleted'] = 'Valmis';
+$labels['statusin-process'] = 'Töös';
+$labels['itipcancellation'] = 'Tühistatud:';
+$labels['itipreply'] = 'Vastus aadressile';
+$labels['itipaccepted'] = 'Võta vastu';
+$labels['itiptentative'] = 'Võib-olla';
+$labels['itipdeclined'] = 'Lükka tagasi';
+$labels['itipdelegated'] = 'Delegeeri';
+$labels['itipneeds-action'] = 'Lükka edasi';
+$labels['itipcomment'] = 'nu vastus';
+$labels['itipeditresponse'] = 'Sisesta vastuse tekst';
+$labels['itipsendercomment'] = 'Saatja kommentaar:';
+$labels['itipsuppressreply'] = 'Ära saada vastust';
+$labels['openpreview'] = 'Ava eelvaade';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['savein'] = 'Save in';
diff --git a/plugins/libcalendaring/localization/fi_FI.inc b/plugins/libcalendaring/localization/fi_FI.inc
index 5df06c12..4a323eb8 100644
--- a/plugins/libcalendaring/localization/fi_FI.inc
+++ b/plugins/libcalendaring/localization/fi_FI.inc
@@ -21,7 +21,6 @@ $labels['trigger-D'] = 'päivää ennen';
 $labels['trigger+M'] = 'minuuttia jälkeen';
 $labels['trigger+H'] = 'tuntia jälkeen';
 $labels['trigger+D'] = 'päivää jälkeen';
-$labels['triggerattime'] = 'kellonaikana';
 $labels['addalarm'] = 'Lisää heräte';
 $labels['removealarm'] = 'Poista heräte';
 $labels['alarmtitle'] = 'Tulevat tapahtumat';
@@ -53,7 +52,7 @@ $labels['onsamedate'] = 'Samana päivänä';
 $labels['forever'] = 'ikuisesti';
 $labels['recurrencend'] = 'kunnes';
 $labels['untilenddate'] = 'pvm saakka';
-$labels['forntimes'] = '$nr kerta(a)';
+$labels['forntimes'] = '$nr kerta(a)'; // old
 $labels['first'] = 'ensimmäinen';
 $labels['second'] = 'toinen';
 $labels['third'] = 'kolmas';
@@ -62,6 +61,15 @@ $labels['last'] = 'viimeinen';
 $labels['dayofmonth'] = 'Kuukaudenpäivä';
 $labels['addrdate'] = 'Lisää toiston pvm';
 $labels['except'] = 'paitsi';
+$labels['statusorganizer'] = 'Järjestäjä';
+$labels['statusaccepted'] = 'Hyväksytty';
+$labels['statustentative'] = 'Alustava';
+$labels['statusdeclined'] = 'Kieltäydytty';
+$labels['statusdelegated'] = 'Delegoitu';
+$labels['statusneeds-action'] = 'Vaatii toimenpiteitä';
+$labels['statusunknown'] = 'Tuntematon';
+$labels['statuscompleted'] = 'Valmis';
+$labels['statusin-process'] = 'Prosessissa';
 $labels['itipinvitation'] = 'Kutsu';
 $labels['itipupdate'] = 'Päivitys';
 $labels['itipcancellation'] = 'Peruttu:';
@@ -90,8 +98,11 @@ $labels['acceptinvitation'] = 'Hyväksytkö tämän kutsun?';
 $labels['acceptattendee'] = 'Hyväksy osallistuja';
 $labels['declineattendee'] = 'Estä osallistuja';
 $labels['declineattendeeconfirm'] = 'Anna viesti estetylle osallistujalle (vaihtoehtoinen):';
+$labels['rsvpmodeall'] = 'Koko sarja';
 $labels['rsvpmodecurrent'] = 'Vain tämä esiintymä';
 $labels['rsvpmodefuture'] = 'Tämä ja tulevat esiintymät';
+$labels['itipsingleoccurrence'] = 'Tämä on <em>yksittäinen esiintymä</em> tapahtumasarjassa';
+$labels['itipfutureoccurrence'] = 'Viittaa <em>tähän ja kaikkiin tuleviin esiintymiin</em> tapahtumasarjassa';
 $labels['itipmessagesingleoccurrence'] = 'Tämä viesti viittaa vain yhteen esiintymään';
 $labels['itipmessagefutureoccurrence'] = 'Tämä viesti viittaa tähän ja kaikkiin tuleviin esiintymiin';
 $labels['youhaveaccepted'] = 'Olet hyväksynyt tämän kutsun';
@@ -126,7 +137,10 @@ $labels['delegateinvitation'] = 'Delegoi kutsu';
 $labels['delegateto'] = 'Delegoi henkilölle';
 $labels['delegatersvpme'] = 'Pidä minut ajan tasalla tämän tapauksen päivityksistä';
 $labels['delegateinvalidaddress'] = 'Anna valiidi sähköpostiosoite delegoiaksesi';
+$labels['delegatedto'] = 'Delegoitu henkilölle:';
+$labels['delegatedfrom'] = 'Delegoinut:';
 $labels['savingdata'] = 'Tallennetaan tietoja...';
+$labels['savein'] = 'Tallenna kohteeseen';
 $labels['expandattendeegroup'] = 'Korvaa ryhmän jäsenillä';
 $labels['expandattendeegroupnodata'] = 'Korvaaminen ryhmän jäsenillä ei onnistu. Yhtään jäsentä ei löydy.';
 $labels['expandattendeegrouperror'] = 'Korvaaminen ryhmän jäsenillä ei onnistu. Tämä saattaa sisältää liian monta jäsentä.';
diff --git a/plugins/libcalendaring/localization/fr_FR.inc b/plugins/libcalendaring/localization/fr_FR.inc
index 7fd3bcab..dc96585c 100644
--- a/plugins/libcalendaring/localization/fr_FR.inc
+++ b/plugins/libcalendaring/localization/fr_FR.inc
@@ -6,13 +6,13 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
-$labels['until'] = 'Jusqu\'à';
+$labels['until'] = 'jusqu\'à';
 $labels['at'] = 'à';
-$labels['alarmemail'] = 'Envoyer un email';
+$labels['alarmemail'] = 'Envoyer un e-mail';
 $labels['alarmdisplay'] = 'Voir le message';
 $labels['alarmaudio'] = 'Alerte sonore';
 $labels['alarmdisplayoption'] = 'Message';
-$labels['alarmemailoption'] = 'Email';
+$labels['alarmemailoption'] = 'E-mail';
 $labels['alarmaudiooption'] = 'Son';
 $labels['alarmat'] = 'à $datetime';
 $labels['trigger@'] = 'à la date';
@@ -22,7 +22,18 @@ $labels['trigger-D'] = 'jours avant';
 $labels['trigger+M'] = 'minutes après';
 $labels['trigger+H'] = 'heures après';
 $labels['trigger+D'] = 'jours après';
-$labels['triggerattime'] = 'à l\'heure';
+$labels['triggerend-M'] = 'minutes avant la fin';
+$labels['triggerend-H'] = 'heures avant la fin';
+$labels['triggerend-D'] = 'jours avant la fin';
+$labels['triggerend+M'] = 'minutes après la fin';
+$labels['triggerend+H'] = 'heures après la fin';
+$labels['triggerend+D'] = 'jours après la fin';
+$labels['trigger0'] = 'dans les temps';
+$labels['triggerattime'] = 'au début';
+$labels['triggerattimeend'] = 'à la fin';
+$labels['relatedstart'] = 'début';
+$labels['relatedendevent'] = 'fin';
+$labels['relatedendtask'] = 'date de fin';
 $labels['addalarm'] = 'Ajouter une alarme';
 $labels['removealarm'] = 'Supprimer l\'alarme';
 $labels['alarmtitle'] = 'Evénements à venir';
@@ -35,38 +46,50 @@ $labels['repeatinhrs'] = 'Répéter dans $hrs heures';
 $labels['repeattomorrow'] = 'Répéter demain';
 $labels['repeatinweek'] = 'Répéter dans une semaine';
 $labels['showmore'] = 'Afficher plus...';
+$labels['recurring'] = 'Répétitions';
 $labels['frequency'] = 'Répéter';
-$labels['never'] = 'Jamais';
-$labels['daily'] = 'Quotidienne';
-$labels['weekly'] = 'Hebdomadaire';
-$labels['monthly'] = 'Mensuelle';
-$labels['yearly'] = 'Annuelle';
-$labels['rdate'] = 'on dates';
+$labels['never'] = 'jamais';
+$labels['daily'] = 'quotidienne';
+$labels['weekly'] = 'hebdomadaire';
+$labels['monthly'] = 'mensuelle';
+$labels['yearly'] = 'annuelle';
+$labels['rdate'] = 'à certaines dates';
 $labels['every'] = 'Tous les';
 $labels['days'] = 'jour(s)';
 $labels['weeks'] = 'semaine(s)';
 $labels['months'] = 'mois';
 $labels['years'] = 'année(s) en :';
+$labels['bydates'] = 'Le';
 $labels['bydays'] = 'Le';
+$labels['bymonths'] = 'Le';
 $labels['untildate'] = 'le';
 $labels['each'] = 'Chaque';
 $labels['onevery'] = 'Tous les';
-$labels['onsamedate'] = 'à la même date';
+$labels['onsamedate'] = 'À la même date';
 $labels['forever'] = 'toujours';
-$labels['recurrencend'] = 'Jusqu\'à';
+$labels['recurrencend'] = 'jusqu\'à';
 $labels['untilenddate'] = 'jusqu\'à la date';
-$labels['forntimes'] = '$nr fois';
+$labels['forntimes'] = '$nr fois'; // old
 $labels['first'] = 'premier';
 $labels['second'] = 'deuxième';
 $labels['third'] = 'troisième';
 $labels['fourth'] = 'quatrième';
 $labels['last'] = 'dernier';
 $labels['dayofmonth'] = 'Jour du mois';
-$labels['addrdate'] = 'Add repeat date';
+$labels['addrdate'] = 'Ajoutez une date répétée';
 $labels['except'] = 'sauf';
+$labels['statusorganizer'] = 'Organisateur';
+$labels['statusaccepted'] = 'Accepté';
+$labels['statustentative'] = 'Provisoire';
+$labels['statusdeclined'] = 'Refusé';
+$labels['statusdelegated'] = 'Délégué';
+$labels['statusneeds-action'] = 'Action exigée';
+$labels['statusunknown'] = 'Inconnu';
+$labels['statuscompleted'] = 'Terminée';
+$labels['statusin-process'] = 'En cours';
 $labels['itipinvitation'] = 'Invitation à';
 $labels['itipupdate'] = 'Mise à jour de';
-$labels['itipcancellation'] = 'Annulation:';
+$labels['itipcancellation'] = 'Annulation :';
 $labels['itipreply'] = 'Répondre à';
 $labels['itipaccepted'] = 'Accepter';
 $labels['itiptentative'] = 'Peut-être';
@@ -77,54 +100,62 @@ $labels['itipcomment'] = 'Votre réponse';
 $labels['itipeditresponse'] = 'Saisissez votre réponse';
 $labels['itipsendercomment'] = 'Commentaire des expéditeurs';
 $labels['itipsuppressreply'] = 'Ne pas envoyer de réponse';
-$labels['itipobjectnotfound'] = 'L\'objet en lié à ce message n\'a pas été trouvé sur votre compte.';
+$labels['itipobjectnotfound'] = 'L\'objet auquel il est fait référence dans ce message n\'a pas été trouvé dans votre compte.';
 $labels['itipsubjectaccepted'] = '"$title" a été accepté par $name';
-$labels['itipsubjecttentative'] = '"$title" a été accepté provisoirement par $name';
+$labels['itipsubjecttentative'] = '"$title" a provisoirement été accepté par $name';
 $labels['itipsubjectdeclined'] = '"$title" a été refusé par $name';
 $labels['itipsubjectin-process'] = '"$title" est en cours de traitement par $name';
-$labels['itipsubjectcompleted'] = '"$title" a été traité par $name';
+$labels['itipsubjectcompleted'] = '"$title" a été rempli par $name';
 $labels['itipsubjectcancel'] = 'Votre affectation à "$title" a été annulée';
 $labels['itipsubjectdelegated'] = '"$title$ a été délégué par $name';
 $labels['itipsubjectdelegatedto'] = '"$title" vous a été délégué par $name';
-$labels['itipnewattendee'] = 'Ceci est une réponse d\'un nouveau participant';
-$labels['updateattendeestatus'] = 'Modifier le statut des participants';
-$labels['acceptinvitation'] = 'Acceptez-vous cette invitation?';
+$labels['itipnewattendee'] = 'Voici la réponse d\'un nouveau participant';
+$labels['updateattendeestatus'] = 'Modifier le statut du participant';
+$labels['acceptinvitation'] = 'Acceptez-vous cette invitation ?';
 $labels['acceptattendee'] = 'Accepter l\'utilisateur';
-$labels['declineattendee'] = 'Décliner l\'utilisateur';
-$labels['declineattendeeconfirm'] = 'Saisissez un message pour l\'utilisateur qui décline l\'invitation (optionnel) :';
+$labels['declineattendee'] = 'Refuser l\'utilisateur';
+$labels['declineattendeeconfirm'] = 'Saisissez un message pour l\'utilisateur refusé (optionnel) :';
+$labels['rsvpmodeall'] = 'Les séries entières';
+$labels['rsvpmodecurrent'] = 'Cette occurrence seulement';
+$labels['rsvpmodefuture'] = 'Celle-ci et les occurrences futures';
+$labels['itipsingleoccurrence'] = 'C\'est une <em>seule occurrence</em> parmi une série d\'événements';
+$labels['itipfutureoccurrence'] = 'Se réfère à <em>celle-ci et à toutes les occurrences futures</em> parmi une série d\'événements';
+$labels['itipmessagesingleoccurrence'] = 'Le message se réfère seulement à cette occurrence';
+$labels['itipmessagefutureoccurrence'] = 'Le message se réfère à celle-ci et à toutes les occurrences futures';
 $labels['youhaveaccepted'] = 'Vous avez accepté cette invitation';
-$labels['youhavetentative'] = 'Vous avez accepté provisoirement cette invitation';
+$labels['youhavetentative'] = 'Vous avez provisoirement accepté cette invitation';
 $labels['youhavedeclined'] = 'Vous avez refusé cette invitation';
 $labels['youhavedelegated'] = 'Vous avez délégué cette invitation';
-$labels['youhavein-process'] = 'Vous traiter cette affectation';
+$labels['youhavein-process'] = 'Vous traitez cette affectation';
 $labels['youhavecompleted'] = 'Vous avez traité cette affectation';
 $labels['youhaveneeds-action'] = 'Vous êtes en attente d\'une réponse à cette invitation';
 $labels['youhavepreviouslyaccepted'] = 'Vous avez déjà accepté cette invitation';
 $labels['youhavepreviouslytentative'] = 'Vous avez déjà tenté d\'accepter cette invitation';
 $labels['youhavepreviouslydeclined'] = 'Vous avez déjà décliné cette invitation';
 $labels['youhavepreviouslydelegated'] = 'Vous avez déjà délégué cette invitation';
-$labels['youhavepreviouslyin-process'] = 'Vous avez déjà signalé que vous traitez cette affectation';
+$labels['youhavepreviouslyin-process'] = 'Vous avez déjà signalé que vous traitiez cette affectation';
 $labels['youhavepreviouslycompleted'] = 'Vous avez déjà fini le traitement de cette affectation';
-$labels['youhavepreviouslyneeds-action'] = 'Vous êtes en attente de la réponse pour cette invitation';
-$labels['attendeeaccepted'] = 'Cet utilisateur a accepté l\'invitaion';
+$labels['youhavepreviouslyneeds-action'] = 'Vous êtes en attente de réponse pour cette invitation';
+$labels['attendeeaccepted'] = 'Cet utilisateur a accepté l\'invitation';
 $labels['attendeetentative'] = 'Cette utilisateur tente d\'accepter l\'invitation';
 $labels['attendeedeclined'] = 'Cet utilisateur a décliné l\'invitation';
 $labels['attendeedelegated'] = 'Cet utilisateur a délégué à $delegatedto';
 $labels['attendeein-process'] = 'Cet utilisateur traite la tâche';
 $labels['attendeecompleted'] = 'Cet utilisateur a fini la tâche';
-$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
-$labels['outdatedinvitation'] = 'Cet invitation a été remplacée par une nouvelle version';
-$labels['importtocalendar'] = 'Enregistrer dans mon agenda';
-$labels['removefromcalendar'] = 'Supprimer de mon agenda';
+$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet événement';
+$labels['outdatedinvitation'] = 'Cette invitation a été remplacée par une nouvelle version';
+$labels['importtocalendar'] = 'Enregistrer dans mon calendrier';
+$labels['removefromcalendar'] = 'Supprimer de mon calendrier';
 $labels['updatemycopy'] = 'Mise à jour de ma copie';
 $labels['openpreview'] = 'Ouvrir la prévisualisation';
 $labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet objet ?';
 $labels['declinedeleteconfirm'] = 'Voulez-vous supprimer cet objet décliné de votre compte ?';
 $labels['delegateinvitation'] = 'Invitation à déléguer';
 $labels['delegateto'] = 'Déléguer à ';
-$labels['delegatersvpme'] = 'Me tenir informé des mises à jours de cet effet';
+$labels['delegatersvpme'] = 'Me tenir informé des mises à jour de cet effet';
 $labels['delegateinvalidaddress'] = 'Entrer une adresse électronique valide pour le délégué';
 $labels['savingdata'] = 'Enregistrer...';
+$labels['savein'] = 'Enregistrer sous';
 $labels['expandattendeegroup'] = 'Remplacement par les membres du groupe';
 $labels['expandattendeegroupnodata'] = 'Impossible de substituer ce groupe, il ne contient aucun membre.';
 $labels['expandattendeegrouperror'] = 'Impossible de substituer ce groupe, il contient trop de membres.';
diff --git a/plugins/libcalendaring/localization/he_IL.inc b/plugins/libcalendaring/localization/he_IL.inc
new file mode 100644
index 00000000..8a2dc5ec
--- /dev/null
+++ b/plugins/libcalendaring/localization/he_IL.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizer';
+$labels['statustentative'] = 'Tentative';
+$labels['statusunknown'] = 'Unknown';
diff --git a/plugins/libcalendaring/localization/hr_HR.inc b/plugins/libcalendaring/localization/hr_HR.inc
new file mode 100644
index 00000000..42ba818b
--- /dev/null
+++ b/plugins/libcalendaring/localization/hr_HR.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['until'] = 'until';
+$labels['frequency'] = 'Repeat';
+$labels['recurrencend'] = 'until';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizer';
+$labels['statustentative'] = 'Tentative';
+$labels['statusunknown'] = 'Unknown';
+$labels['savingdata'] = 'Saving data...';
diff --git a/plugins/libcalendaring/localization/hu_HU.inc b/plugins/libcalendaring/localization/hu_HU.inc
index 9a01d5e6..f3639f6a 100644
--- a/plugins/libcalendaring/localization/hu_HU.inc
+++ b/plugins/libcalendaring/localization/hu_HU.inc
@@ -42,14 +42,16 @@ $labels['days'] = 'napon';
 $labels['weeks'] = 'héten';
 $labels['months'] = 'hónapban';
 $labels['years'] = 'évben ekkor:';
+$labels['bydates'] = 'napon';
 $labels['bydays'] = 'napon';
+$labels['bymonths'] = 'napon';
 $labels['untildate'] = 'dátumig';
 $labels['each'] = 'napon';
 $labels['onevery'] = 'minden';
 $labels['onsamedate'] = 'Ugyanazon a dátumon';
 $labels['forever'] = 'örökké';
 $labels['recurrencend'] = 'Eddig';
-$labels['forntimes'] = '$nr alkalommal';
+$labels['forntimes'] = '$nr alkalommal'; // old
 $labels['first'] = 'első';
 $labels['second'] = 'második';
 $labels['third'] = 'harmadik';
@@ -57,6 +59,12 @@ $labels['fourth'] = 'negyedik';
 $labels['last'] = 'utolsó';
 $labels['dayofmonth'] = 'hónap napja';
 $labels['addrdate'] = 'Ismétlési dátum hozzáadása';
+$labels['statusorganizer'] = 'Szervező';
+$labels['statustentative'] = 'Feltételes';
+$labels['statusneeds-action'] = 'Needs action';
+$labels['statusunknown'] = 'Ismeretlen foglaltság';
+$labels['statuscompleted'] = 'Completed';
+$labels['statusin-process'] = 'In process';
 $labels['itipinvitation'] = 'Új esemény:';
 $labels['itipupdate'] = 'Módosítva:';
 $labels['itipcancellation'] = 'Lemondva:';
@@ -94,3 +102,4 @@ $labels['updatemycopy'] = 'Naptárbejegyzés frissítése';
 $labels['deleteobjectconfirm'] = 'Biztos benne, hogy törölni szeretné ezt az elemet?';
 $labels['declinedeleteconfirm'] = 'Biztos benne, hogy törölni szeretné ezt az elutasított elemet a fiókjából?';
 $labels['savingdata'] = 'Adatok mentése...';
+$labels['savein'] = 'Save in';
diff --git a/plugins/libcalendaring/localization/it_IT.inc b/plugins/libcalendaring/localization/it_IT.inc
index c7373dec..fb6c09d1 100644
--- a/plugins/libcalendaring/localization/it_IT.inc
+++ b/plugins/libcalendaring/localization/it_IT.inc
@@ -40,20 +40,28 @@ $labels['days'] = 'giorno/i';
 $labels['weeks'] = 'settimana/e';
 $labels['months'] = 'mese/i';
 $labels['years'] = 'anno/i in:';
+$labels['bydates'] = 'Di';
 $labels['bydays'] = 'Di';
+$labels['bymonths'] = 'Di';
 $labels['untildate'] = 'il';
 $labels['each'] = 'Nei giorni';
 $labels['onevery'] = 'Ogni';
 $labels['onsamedate'] = 'Alla stessa data';
 $labels['forever'] = 'per sempre';
 $labels['recurrencend'] = 'fino al';
-$labels['forntimes'] = 'per $nr volte';
+$labels['forntimes'] = 'per $nr volte'; // old
 $labels['first'] = 'primo';
 $labels['second'] = 'secondo';
 $labels['third'] = 'terzo';
 $labels['fourth'] = 'quarto';
 $labels['last'] = 'ultimo';
 $labels['dayofmonth'] = 'Giorno del mese';
+$labels['statusorganizer'] = 'Organizzatore';
+$labels['statustentative'] = 'Provvisorio';
+$labels['statusneeds-action'] = 'Necessaria azione';
+$labels['statusunknown'] = 'Sconosciuto';
+$labels['statuscompleted'] = 'Completato';
+$labels['statusin-process'] = 'In processo';
 $labels['itipinvitation'] = 'Invito a';
 $labels['itipupdate'] = 'Aggiornamento di';
 $labels['itipcancellation'] = 'Annullato:';
diff --git a/plugins/libcalendaring/localization/ja_JP.inc b/plugins/libcalendaring/localization/ja_JP.inc
index 2f22aaba..c7585cad 100644
--- a/plugins/libcalendaring/localization/ja_JP.inc
+++ b/plugins/libcalendaring/localization/ja_JP.inc
@@ -10,8 +10,10 @@ $labels['until'] = 'まで';
 $labels['at'] = 'の';
 $labels['alarmemail'] = 'メール送信';
 $labels['alarmdisplay'] = 'メッセージ表示';
+$labels['alarmaudio'] = 'サウンド再生';
 $labels['alarmdisplayoption'] = 'メッセージ';
 $labels['alarmemailoption'] = 'Eメール';
+$labels['alarmaudiooption'] = '音声';
 $labels['alarmat'] = '$datetime に';
 $labels['trigger@'] = '日付に';
 $labels['trigger-M'] = '分前';
@@ -20,6 +22,8 @@ $labels['trigger-D'] = '分後';
 $labels['trigger+M'] = '分後';
 $labels['trigger+H'] = '時間後';
 $labels['trigger+D'] = '日後';
+$labels['addalarm'] = 'アラーム追加';
+$labels['removealarm'] = 'アラーム削除';
 $labels['alarmtitle'] = '今後のイベント';
 $labels['dismissall'] = '全て削除';
 $labels['dismiss'] = '削除';
@@ -30,31 +34,47 @@ $labels['repeatinhrs'] = '$hrs で繰返し';
 $labels['repeattomorrow'] = '明日繰返し';
 $labels['repeatinweek'] = '1週間で繰返し';
 $labels['showmore'] = 'さらに表示…';
+$labels['recurring'] = '繰返し';
 $labels['frequency'] = '繰返し';
 $labels['never'] = '繰返さない';
 $labels['daily'] = '毎日';
 $labels['weekly'] = '毎週';
 $labels['monthly'] = '毎月';
 $labels['yearly'] = '毎年';
+$labels['rdate'] = 'その日に';
 $labels['every'] = 'いつでも';
 $labels['days'] = '日(s)';
 $labels['weeks'] = '週(s)';
 $labels['months'] = '月(s)';
 $labels['years'] = '年(s):';
+$labels['bydates'] = '上';
 $labels['bydays'] = '上';
+$labels['bymonths'] = '上';
 $labels['untildate'] = 'その';
 $labels['each'] = 'いずれも';
 $labels['onevery'] = '各';
 $labels['onsamedate'] = 'いつか';
 $labels['forever'] = 'ずっと';
 $labels['recurrencend'] = 'まで';
-$labels['forntimes'] = '$nr まで(s)';
+$labels['untilenddate'] = '日まで';
+$labels['forntimes'] = '$nr まで(s)'; // old
 $labels['first'] = '第1週';
 $labels['second'] = '第2週';
 $labels['third'] = '第3週';
 $labels['fourth'] = '第4週';
 $labels['last'] = '最終週';
 $labels['dayofmonth'] = '日';
+$labels['addrdate'] = '繰返し日追加';
+$labels['except'] = '例外';
+$labels['statusorganizer'] = '編成者';
+$labels['statusaccepted'] = '承諾されました';
+$labels['statustentative'] = '仮';
+$labels['statusdeclined'] = '辞退されました';
+$labels['statusdelegated'] = '依頼されました';
+$labels['statusneeds-action'] = 'やるべき事';
+$labels['statusunknown'] = '不明';
+$labels['statuscompleted'] = '完了';
+$labels['statusin-process'] = '進行中';
 $labels['itipinvitation'] = '招待する';
 $labels['itipupdate'] = '更新';
 $labels['itipcancellation'] = 'キャンセル';
@@ -62,16 +82,69 @@ $labels['itipreply'] = '返信';
 $labels['itipaccepted'] = '承諾';
 $labels['itiptentative'] = 'たぶん';
 $labels['itipdeclined'] = '辞退';
-$labels['itipdelegated'] = '委任者';
+$labels['itipdelegated'] = '代理人';
+$labels['itipneeds-action'] = '延期';
+$labels['itipcomment'] = 'あなたの応答';
+$labels['itipeditresponse'] = '応答文の入力';
+$labels['itipsendercomment'] = '送信者のコメント:';
+$labels['itipsuppressreply'] = '応答を送らない';
+$labels['itipobjectnotfound'] = 'このメッセージから参照されるオブジェクトはアカウントには見つかりません。';
 $labels['itipsubjectaccepted'] = '$name が "$title" を承諾しました';
 $labels['itipsubjecttentative'] = '$name が "$title" を仮承諾しました';
 $labels['itipsubjectdeclined'] = '$name が "$title" を辞退しました';
+$labels['itipsubjectin-process'] = '"$title" は $name によって進行中です';
+$labels['itipsubjectcompleted'] = '"$title" は $name によって完了されました';
+$labels['itipsubjectcancel'] = '"$title" へのあなたの参加はキャンセルされました。';
+$labels['itipsubjectdelegated'] = '"$title" は $name によって代理されました';
+$labels['itipsubjectdelegatedto'] = '"$title" は $name によってあなたへ代理されました';
+$labels['itipnewattendee'] = 'これは新しい参加者からの応答です';
 $labels['updateattendeestatus'] = '参加者の状況更新';
 $labels['acceptinvitation'] = 'この招待を承諾しますか?';
-$labels['youhaveaccepted'] = 'この招待を承諾しました';
-$labels['youhavetentative'] = 'この招待を仮承諾しました。';
-$labels['youhavedeclined'] = 'この招待を辞退しました。';
+$labels['acceptattendee'] = '参加者を承諾';
+$labels['declineattendee'] = '参加者を断る';
+$labels['declineattendeeconfirm'] = '断った参加者へのメッセージを入力(オプション):';
+$labels['rsvpmodeall'] = '全シリーズ';
+$labels['rsvpmodecurrent'] = '出来事のみ';
+$labels['rsvpmodefuture'] = 'この出来事と将来の出来事';
+$labels['itipsingleoccurrence'] = 'これは一連のイベント外の <em>単体の出来事</em> です';
+$labels['itipfutureoccurrence'] = '一連のイベントの <em>この出来事と将来の出来事</em> を参照する';
+$labels['itipmessagesingleoccurrence'] = 'このメッセージはこの単体の出来事のみを参照します';
+$labels['itipmessagefutureoccurrence'] = 'このメッセージはこの出来事とすべての将来の出来事を参照します';
+$labels['youhaveaccepted'] = 'あなたはこの招待を承諾しました';
+$labels['youhavetentative'] = 'あなたはこの招待を仮承諾しました。';
+$labels['youhavedeclined'] = 'あなたはこの招待を辞退しました。';
+$labels['youhavedelegated'] = 'あなたはこの招待を代行させました';
+$labels['youhavein-process'] = 'あなたはこの割当を実行中です';
+$labels['youhavecompleted'] = 'あなたはこの割当を完了しました';
+$labels['youhaveneeds-action'] = 'この招待へのあなたの応答はまだ保留中です';
+$labels['youhavepreviouslyaccepted'] = 'あなたはこの招待を前もって承諾しました';
+$labels['youhavepreviouslytentative'] = 'あなたはこの招待を前もって仮承諾しました';
+$labels['youhavepreviouslydeclined'] = 'あなたはこの招待を前もって断りました';
+$labels['youhavepreviouslydelegated'] = 'この招待を前もって代行させました';
+$labels['youhavepreviouslyin-process'] = 'あなたは前もってこの割当を実行する事をレポートしました';
+$labels['youhavepreviouslycompleted'] = 'あなたは前もってこの割当を完了しました';
+$labels['youhavepreviouslyneeds-action'] = 'この招待へのあなたの応答はまだ保留中です';
+$labels['attendeeaccepted'] = '参加者は承諾しました';
+$labels['attendeetentative'] = '参加者は仮承諾しました';
+$labels['attendeedeclined'] = '参加者は断りました';
+$labels['attendeedelegated'] = '参加者は $delegatedto へ代行させました';
+$labels['attendeein-process'] = '参加者は進行中です';
+$labels['attendeecompleted'] = '参加者は完了しました';
 $labels['notanattendee'] = 'このイベントの出席者として一覧にありません';
+$labels['outdatedinvitation'] = 'この招待は新しいバージョンへ置き換えられました';
 $labels['importtocalendar'] = 'カレンダーに保存';
 $labels['removefromcalendar'] = 'カレンダーから削除';
+$labels['updatemycopy'] = '複製を更新';
+$labels['openpreview'] = 'プレビューを開く';
+$labels['deleteobjectconfirm'] = '本当にこのオブジェクトを削除しますか?';
+$labels['declinedeleteconfirm'] = 'アカウントからこの断ったオブジェクトも削除しますか?';
+$labels['delegateinvitation'] = '招待を代行させる';
+$labels['delegateto'] = '代行先';
+$labels['delegatersvpme'] = 'この出来事の更新に関する通知を続ける';
+$labels['delegateinvalidaddress'] = '代行させるのに有効なEメールアドレスを入力してください';
 $labels['savingdata'] = 'データを保存中…';
+$labels['savein'] = '…に保存';
+$labels['expandattendeegroup'] = 'グループメンバーの代理人';
+$labels['expandattendeegroupnodata'] = 'このグループの代理ができません。メンバーが見つかりません。';
+$labels['expandattendeegrouperror'] = 'このグループの代理ができません。おそらくメンバーが多すぎます。';
+$labels['expandattendeegroupsizelimit'] = 'このグループは代理するにはメンバーが多すぎます。';
diff --git a/plugins/libcalendaring/localization/ko_KR.inc b/plugins/libcalendaring/localization/ko_KR.inc
new file mode 100644
index 00000000..29fd4475
--- /dev/null
+++ b/plugins/libcalendaring/localization/ko_KR.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['until'] = '까지';
+$labels['frequency'] = '반복';
+$labels['recurrencend'] = '까지';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = '주최자';
+$labels['statustentative'] = '임시';
+$labels['statusunknown'] = '알 수 없는';
+$labels['savingdata'] = '자료 저장중...';
diff --git a/plugins/libcalendaring/localization/lv.inc b/plugins/libcalendaring/localization/lv.inc
new file mode 100644
index 00000000..f7edbd24
--- /dev/null
+++ b/plugins/libcalendaring/localization/lv.inc
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['until'] = 'līdz';
+$labels['at'] = ' ';
+$labels['alarmemail'] = 'Nosūtīt e-pastu';
+$labels['alarmdisplay'] = 'Parādīt paziņojumu';
+$labels['alarmaudio'] = 'Spēlēt skaņu';
+$labels['alarmdisplayoption'] = 'Paziņojums';
+$labels['alarmemailoption'] = 'E-pasts';
+$labels['alarmaudiooption'] = 'Skaņa';
+$labels['alarmat'] = '$datetime';
+$labels['trigger@'] = 'tieši šai datumā';
+$labels['trigger-M'] = 'minūtes pirms';
+$labels['trigger-H'] = 'stundas pirms';
+$labels['trigger-D'] = 'dienas pirms';
+$labels['trigger+M'] = 'minūtes pēc';
+$labels['trigger+H'] = 'stundas pēc';
+$labels['trigger+D'] = 'dienas pēc';
+$labels['triggerend-M'] = 'minūtes pirms beigām';
+$labels['triggerend-H'] = 'stundas pirms beigām';
+$labels['triggerend-D'] = 'dienas pirms beigām';
+$labels['triggerend+M'] = 'minūtes pēc beigām';
+$labels['triggerend+H'] = 'stundas pēc beigām';
+$labels['triggerend+D'] = 'dienas pēc beigām';
+$labels['trigger0'] = 'tieši laikā';
+$labels['triggerattime'] = 'sākumā';
+$labels['triggerattimeend'] = 'beigās';
+$labels['relatedstart'] = 'sākums';
+$labels['relatedendevent'] = 'beigas';
+$labels['relatedendtask'] = 'ilgums';
+$labels['addalarm'] = 'Pievienot atgādinājumu';
+$labels['removealarm'] = 'Noņemt atgādinājumu';
+$labels['alarmtitle'] = 'Tuvojošies notikumi';
+$labels['dismissall'] = 'Aizmirst visus';
+$labels['dismiss'] = 'Aizmirst';
+$labels['snooze'] = 'Iesnausties';
+$labels['repeatinmin'] = 'Atgādināt $min minūtes pirms';
+$labels['repeatinhr'] = 'Atgādināt 1 stundu pirms';
+$labels['repeatinhrs'] = 'Atgādināt $hrs stundas pirms';
+$labels['repeattomorrow'] = 'Atgādināt rīt';
+$labels['repeatinweek'] = 'Atgādināt pēc nedēļas';
+$labels['showmore'] = 'Parādīt vairāk ...';
+$labels['recurring'] = 'Atkārtojumi';
+$labels['frequency'] = 'Atkārtot';
+$labels['never'] = 'nekad';
+$labels['daily'] = 'ikdienas';
+$labels['weekly'] = 'iknedēļas';
+$labels['monthly'] = 'ikmēneša';
+$labels['yearly'] = 'ikgadējs';
+$labels['rdate'] = 'datumos';
+$labels['every'] = 'Katrā';
+$labels['days'] = 'dienā(-s)';
+$labels['weeks'] = 'nedēļā(-s)';
+$labels['months'] = 'mēnesī(-šos)';
+$labels['years'] = 'gadā(-os)';
+$labels['bydates'] = ' ';
+$labels['bydays'] = ' ';
+$labels['bymonths'] = ' ';
+$labels['untildate'] = ' ';
+$labels['each'] = 'Katru';
+$labels['onevery'] = 'Katrā';
+$labels['onsamedate'] = 'Tai pašā dienā';
+$labels['forever'] = 'bezgalīgi';
+$labels['recurrencend'] = 'līdz';
+$labels['untilenddate'] = 'līdz datumam';
+$labels['forntimes'] = '$nr reizi(-es)'; // old
+$labels['first'] = 'pirmā';
+$labels['second'] = 'otrā';
+$labels['third'] = 'trešā';
+$labels['fourth'] = 'ceturtā';
+$labels['last'] = 'pēdējā';
+$labels['dayofmonth'] = 'Mēneša diena';
+$labels['addrdate'] = 'Pievienot atkārtošanas datumu';
+$labels['except'] = 'izņemot';
+$labels['statusorganizer'] = 'Organizētājs';
+$labels['statusaccepted'] = 'Pieņemts';
+$labels['statustentative'] = 'Varbūt';
+$labels['statusdeclined'] = 'Noraidīts';
+$labels['statusdelegated'] = 'Deleģēts';
+$labels['statusneeds-action'] = 'Nepieciešama darbība';
+$labels['statusunknown'] = 'Nezināms';
+$labels['statuscompleted'] = 'Pabeigts';
+$labels['statusin-process'] = 'Procesā';
+$labels['itipinvitation'] = 'Uzaicinājums uz';
+$labels['itipupdate'] = 'Izmaiņas';
+$labels['itipcancellation'] = 'Atcelts:';
+$labels['itipreply'] = 'Atbildēt:';
+$labels['itipaccepted'] = 'Pieņemt';
+$labels['itiptentative'] = 'Varbūt';
+$labels['itipdeclined'] = 'Noraidīt';
+$labels['itipdelegated'] = 'Deleģēt';
+$labels['itipneeds-action'] = 'Aizturēt';
+$labels['itipcomment'] = 'Jūsu atbilde';
+$labels['itipeditresponse'] = 'Ievadiet atbildes tekstu';
+$labels['itipsendercomment'] = 'Sūtītāja piezīmes:';
+$labels['itipsuppressreply'] = 'Nesūtīt atbildi';
+$labels['itipobjectnotfound'] = 'Nav atrodams objekts uz ko atsaucas šis ziņojums ';
+$labels['itipsubjectaccepted'] = '$name pieņēma "$title"';
+$labels['itipsubjecttentative'] = '$name akceptēja varbūtēju dalību "$title"';
+$labels['itipsubjectdeclined'] = '
+$name noraidīja "$title"
+';
+$labels['itipsubjectin-process'] = '$name apstrādā "$title"';
+$labels['itipsubjectcompleted'] = '$name pabeidza "$title"';
+$labels['itipsubjectcancel'] = 'Jūsu dalība "$title" tika atcelta';
+$labels['itipsubjectdelegated'] = '$name deleģēja "$title"';
+$labels['itipsubjectdelegatedto'] = '$name deleģēja jums "$title"';
+$labels['itipnewattendee'] = 'Šī ir atbilde no jauna dalībnieka';
+$labels['updateattendeestatus'] = 'Atjaunot dalībnieka statusu';
+$labels['acceptinvitation'] = 'Vai pieņemat šo uzaicinājumu?';
+$labels['acceptattendee'] = 'Pievienot dalībnieku';
+$labels['declineattendee'] = 'Noraidīt dalībnieku';
+$labels['declineattendeeconfirm'] = 'Ievadiet (neobligātu) ziņojumu noraidītajam dalībniekam:';
+$labels['rsvpmodeall'] = 'Visa virkne';
+$labels['rsvpmodecurrent'] = 'Tikai šai reizē';
+$labels['rsvpmodefuture'] = 'Šai un nākošajās reizēs';
+$labels['itipsingleoccurrence'] = 'Šis ir <em>vienreizējs</em> notikums no virknes';
+$labels['itipfutureoccurrence'] = 'Attiecas uz <em>šo un visām nākamajām</em> notikuma reizēm';
+$labels['itipmessagesingleoccurrence'] = 'Ziņojums attiecas tikai uz šo vienu reizi';
+$labels['itipmessagefutureoccurrence'] = 'Ziņojums attiecas uz šo un visām nākamajām reizēm';
+$labels['youhaveaccepted'] = 'Jūs pieņēmāt šo uzaicinājumu';
+$labels['youhavetentative'] = 'Jūs varbūtēji akceptējāt šo uzaicinājumu';
+$labels['youhavedeclined'] = 'Jūs noraidījāt šo uzaicinājumu';
+$labels['youhavedelegated'] = 'Jūs deleģējāt šo uzaicinājumu';
+$labels['youhavein-process'] = 'Jūs strādājat pie šī norīkojuma';
+$labels['youhavecompleted'] = 'Jūs esat pabeidzis šo norīkojumu';
+$labels['youhaveneeds-action'] = 'Tiek gaidīta jūsu atbilde uz šo uzaicinājumu';
+$labels['youhavepreviouslyaccepted'] = 'Jūs jau bijāt pieņēmis šo uzaicinājumu';
+$labels['youhavepreviouslytentative'] = 'Jūs jau bijāt varbūtēji akceptējis šo uzaicinājumu';
+$labels['youhavepreviouslydeclined'] = 'Jūs jau bijāt noraidījis šo uzaicinājumu';
+$labels['youhavepreviouslydelegated'] = 'Jūs jau bijāt deleģējis šo uzaicinājumu';
+$labels['youhavepreviouslyin-process'] = 'Jūs jau esat ziņojis par veikto darbu šai norīkojumā';
+$labels['youhavepreviouslycompleted'] = 'Jūs jau agrāk esat izpildījis šo norīkojumu';
+$labels['youhavepreviouslyneeds-action'] = 'Tiek gaidīta jūsu atbilde uz šo uzaicinājumu';
+$labels['attendeeaccepted'] = 'Dalībnieks pieņēma';
+$labels['attendeetentative'] = 'Dalībnieks varbūtēji pieņēma';
+$labels['attendeedeclined'] = 'Dalībnieks noraidīja';
+$labels['attendeedelegated'] = 'Dalībnieks deleģēja $delegatedto';
+$labels['attendeein-process'] = 'Dalībnieks apstrādā';
+$labels['attendeecompleted'] = 'Dalībnieks beidza apstrādi';
+$labels['notanattendee'] = 'Jūs neesat šī objekta dalībnieku sarakstā';
+$labels['outdatedinvitation'] = 'Šis uzaicinājums ir aizstāts ar jaunāku versiju';
+$labels['importtocalendar'] = 'Saglabāt manā kalendārā';
+$labels['removefromcalendar'] = 'Dzēst no mana kalendāra';
+$labels['updatemycopy'] = 'Jaunināt manu kopiju';
+$labels['openpreview'] = 'Atvērt priekšskatu';
+$labels['deleteobjectconfirm'] = 'Vai tiešām vēlaties dzēst šo objektu?';
+$labels['declinedeleteconfirm'] = 'Vai jūs vēlaties arī dzēst šo noraidīto uzaicinājumu no sava konta?';
+$labels['delegateinvitation'] = 'Deleģēt uzaicinājumu';
+$labels['delegateto'] = 'Deleģēt';
+$labels['delegatersvpme'] = 'Informēt mani par šī notikuma izmaiņām';
+$labels['delegateinvalidaddress'] = 'Lūdzu ievadiet derīgu e-pasta adresi, kam jūs deleģējat';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['expandattendeegroup'] = 'Aizstāt ar grupas locekļiem';
+$labels['expandattendeegroupnodata'] = 'Grupu nevar aizstāt. Tajā nav neviena locekļa.';
+$labels['expandattendeegrouperror'] = 'Grupu nevar aizstāt. Tajā ir pārāk daudz locekļu.';
+$labels['expandattendeegroupsizelimit'] = 'Grupu nevar aizstāt. Tajā ir pārāk daudz locekļu.';
diff --git a/plugins/libcalendaring/localization/nl_NL.inc b/plugins/libcalendaring/localization/nl_NL.inc
index 73059e2c..53b1d61c 100644
--- a/plugins/libcalendaring/localization/nl_NL.inc
+++ b/plugins/libcalendaring/localization/nl_NL.inc
@@ -8,10 +8,12 @@
  */
 $labels['until'] = 'tot';
 $labels['at'] = 'om';
-$labels['alarmemail'] = 'Verzend E-mail';
+$labels['alarmemail'] = 'E-mail versturen';
 $labels['alarmdisplay'] = 'Bericht weergeven';
+$labels['alarmaudio'] = 'Geluid afspelen';
 $labels['alarmdisplayoption'] = 'Bericht';
 $labels['alarmemailoption'] = 'E-mail';
+$labels['alarmaudiooption'] = 'Geluid';
 $labels['alarmat'] = 'op $datetime';
 $labels['trigger@'] = 'op datum';
 $labels['trigger-M'] = 'minuten voor';
@@ -20,70 +22,141 @@ $labels['trigger-D'] = 'dagen voor';
 $labels['trigger+M'] = 'minuten na';
 $labels['trigger+H'] = 'uren na';
 $labels['trigger+D'] = 'dagen na';
-$labels['triggerattime'] = 'at time';
-$labels['alarmtitle'] = 'Aankomende evenementen';
-$labels['repeatinmin'] = 'Herhaal over $min minuten';
-$labels['repeatinhr'] = 'Herhaal over 1 uur';
-$labels['repeatinhrs'] = 'Herhaal over $hrs uur';
-$labels['repeattomorrow'] = 'Herhaal morgen';
-$labels['repeatinweek'] = 'Herhaal over een week';
-$labels['showmore'] = 'Toon meer...';
-$labels['frequency'] = 'Herhaal';
+$labels['triggerend-M'] = 'minuten vóór einde';
+$labels['triggerend-H'] = 'uren vóór einde';
+$labels['triggerend-D'] = 'dagen vóór einde';
+$labels['triggerend+M'] = 'minuten na einde';
+$labels['triggerend+H'] = 'uren na einde';
+$labels['triggerend+D'] = 'dagen na einde';
+$labels['trigger0'] = 'op tijd';
+$labels['triggerattime'] = 'op begintijd';
+$labels['triggerattimeend'] = 'op eindtijd';
+$labels['relatedstart'] = 'begin';
+$labels['relatedendevent'] = 'einde';
+$labels['relatedendtask'] = 'vervaltijd';
+$labels['addalarm'] = 'Herinnering toevoegen';
+$labels['removealarm'] = 'Herinnering verwijderen';
+$labels['alarmtitle'] = 'Geplande activiteiten';
+$labels['dismissall'] = 'Alles negeren';
+$labels['dismiss'] = 'Negeren';
+$labels['snooze'] = 'Uitstellen';
+$labels['repeatinmin'] = 'Binnen $min minuten herhalen';
+$labels['repeatinhr'] = 'Binnen 1 uur herhalen';
+$labels['repeatinhrs'] = 'Binnen $hrs uren herhalen';
+$labels['repeattomorrow'] = 'Morgen herhalen';
+$labels['repeatinweek'] = 'Binnen een week herhalen';
+$labels['showmore'] = 'Meer tonen...';
+$labels['recurring'] = 'Herhalingen';
+$labels['frequency'] = 'Herhalen';
 $labels['never'] = 'nooit';
-$labels['daily'] = 'dagelijks';
-$labels['weekly'] = 'wekelijks';
-$labels['monthly'] = 'maandelijks';
-$labels['yearly'] = 'jaarlijks';
+$labels['daily'] = 'elke dag';
+$labels['weekly'] = 'elke week';
+$labels['monthly'] = 'elke maand';
+$labels['yearly'] = 'elk jaar';
 $labels['rdate'] = 'op datums';
 $labels['every'] = 'Elke';
 $labels['days'] = 'dag(en)';
 $labels['weeks'] = 'week / weken';
 $labels['months'] = 'maand(en)';
-$labels['years'] = 'ja(a)r(en) in:';
+$labels['years'] = 'jaar (jaren)';
+$labels['bydates'] = 'Op';
 $labels['bydays'] = 'Op';
+$labels['bymonths'] = 'Op';
 $labels['untildate'] = 'de';
 $labels['each'] = 'Elke';
 $labels['onevery'] = 'Op elke';
 $labels['onsamedate'] = 'Op dezelfde datum';
-$labels['forever'] = 'oneindig';
+$labels['forever'] = 'voor altijd';
 $labels['recurrencend'] = 'tot';
-$labels['forntimes'] = 'voor $nr keer';
+$labels['untilenddate'] = 'tot datum';
+$labels['forntimes'] = 'voor $nr keer'; // old
 $labels['first'] = 'eerste';
 $labels['second'] = 'tweede';
 $labels['third'] = 'derde';
 $labels['fourth'] = 'vierde';
 $labels['last'] = 'laatste';
 $labels['dayofmonth'] = 'Dag van de maand';
-$labels['addrdate'] = 'Voeg herhaal datum toe';
+$labels['addrdate'] = 'Herhaaldatum toevoegen';
+$labels['except'] = 'behalve';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Geaccepteerd';
+$labels['statustentative'] = 'Misschien';
+$labels['statusdeclined'] = 'Afgeslagen';
+$labels['statusdelegated'] = 'Gedelegeerd';
+$labels['statusneeds-action'] = 'Actie vereist';
+$labels['statusunknown'] = 'Onbekend';
+$labels['statuscompleted'] = 'Voltooid';
+$labels['statusin-process'] = 'In behandeling';
 $labels['itipinvitation'] = 'Uitnodiging voor';
 $labels['itipupdate'] = 'Update van';
-$labels['itipcancellation'] = 'Afgelast:';
-$labels['itipaccepted'] = 'Accepteer';
+$labels['itipcancellation'] = 'Geannuleerd:';
+$labels['itipreply'] = 'Antwoord aan';
+$labels['itipaccepted'] = 'Accepteren';
 $labels['itiptentative'] = 'Misschien';
-$labels['itipdeclined'] = 'Afwijzen';
+$labels['itipdeclined'] = 'Afslaan';
 $labels['itipdelegated'] = 'Gedelegeerde';
+$labels['itipneeds-action'] = 'Uitstellen';
 $labels['itipcomment'] = 'Uw antwoord';
-$labels['itipeditresponse'] = 'Voeg een antwoord tekst toe';
-$labels['itipsendercomment'] = 'Opmerking van verzender:';
-$labels['itipobjectnotfound'] = 'Het object waaraan in dit bericht wordt gerefereerd is niet gevonden in uw account.';
+$labels['itipeditresponse'] = 'Typ het antwoord';
+$labels['itipsendercomment'] = 'Opmerking van afzender:';
+$labels['itipsuppressreply'] = 'Geen antwoord sturen';
+$labels['itipobjectnotfound'] = 'Het object uit dit bericht is niet in uw account gevonden.';
 $labels['itipsubjectaccepted'] = '"$title" is geaccepteerd door $name';
+$labels['itipsubjecttentative'] = '"$title" is onder voorbehoud geaccepteerd door $name';
+$labels['itipsubjectdeclined'] = '"$title" is afgeslagen door $name';
+$labels['itipsubjectin-process'] = '"$title" wordt behandeld door $name';
+$labels['itipsubjectcompleted'] = '"$title" is voltooid door $name';
 $labels['itipsubjectcancel'] = 'Uw deelname aan "$title" is geannuleerd';
+$labels['itipsubjectdelegated'] = '"$title" is gedelegeerd door $name';
+$labels['itipsubjectdelegatedto'] = '"$title" is door $name gedelegeerd aan u';
 $labels['itipnewattendee'] = 'Dit is een antwoord van een nieuwe deelnemer';
-$labels['updateattendeestatus'] = 'Update status van deelnemer';
-$labels['acceptinvitation'] = 'Accepteer je deze uitnodiging?';
-$labels['acceptattendee'] = 'Accepteer deelnemer';
-$labels['declineattendee'] = 'Afwijzen deelnemer';
+$labels['updateattendeestatus'] = 'Status van deelnemer bijwerken';
+$labels['acceptinvitation'] = 'Accepteert u deze uitnodiging?';
+$labels['acceptattendee'] = 'Deelnemer accepteren';
+$labels['declineattendee'] = 'Deelnemer afwijzen';
 $labels['declineattendeeconfirm'] = 'Voeg een bericht toe voor de afgewezen deelnemer (optioneel):';
-$labels['youhaveaccepted'] = 'Je hebt de uitnodiging geaccepteerd';
-$labels['youhavedeclined'] = 'Je hebt deze uitnodiging afgewezen';
-$labels['youhavedelegated'] = 'U heeft deze uitnodiging gedelegeerd';
+$labels['rsvpmodeall'] = 'De gehele reeks';
+$labels['rsvpmodecurrent'] = 'Alleen deze activiteit';
+$labels['rsvpmodefuture'] = 'Deze en toekomstige activiteiten';
+$labels['itipsingleoccurrence'] = 'Dit is <em>een enkele activiteit</em> uit een reeks activiteiten';
+$labels['itipfutureoccurrence'] = 'Verwijst naar <em>deze en alle toekomstige activiteiten</em> uit een reeks activiteiten';
+$labels['itipmessagesingleoccurrence'] = 'Het bericht verwijst alleen naar deze activiteit';
+$labels['itipmessagefutureoccurrence'] = 'Het bericht verwijst naar deze en alle toekomstige activiteiten';
+$labels['youhaveaccepted'] = 'U hebt deze uitnodiging geaccepteerd';
+$labels['youhavetentative'] = 'U hebt deze uitnodiging onder voorbehoud geaccepteerd';
+$labels['youhavedeclined'] = 'U hebt deze uitnodiging afgeslagen';
+$labels['youhavedelegated'] = 'U hebt deze uitnodiging gedelegeerd';
+$labels['youhavein-process'] = 'U werkt momenteel aan deze opdracht';
+$labels['youhavecompleted'] = 'U hebt deze opdracht voltooid';
+$labels['youhaveneeds-action'] = 'U hebt deze uitnodiging nog niet beantwoord';
+$labels['youhavepreviouslyaccepted'] = 'U hebt deze uitnodiging eerder al geaccepteerd';
+$labels['youhavepreviouslytentative'] = 'U hebt deze uitnodiging eerder al onder voorbehoud geaccepteerd';
+$labels['youhavepreviouslydeclined'] = 'U hebt deze uitnodiging eerder al afgeslagen';
+$labels['youhavepreviouslydelegated'] = 'U hebt deze uitnodiging eerder al gedelegeerd';
+$labels['youhavepreviouslyin-process'] = 'U hebt eerder al gemeld dat u aan deze opdracht werkt';
+$labels['youhavepreviouslycompleted'] = 'U hebt deze opdracht eerder al voltooid';
+$labels['youhavepreviouslyneeds-action'] = 'U hebt deze uitnodiging nog niet beantwoord';
 $labels['attendeeaccepted'] = 'Deelnemer heeft geaccepteerd';
-$labels['attendeetentative'] = 'Deelnemer heeft voorwaardelijk geaccepteerd';
-$labels['attendeedeclined'] = 'Deelnemer heeft afgewezen ';
-$labels['attendeedelegated'] = 'Deelnemer heeft gedelegeerd aan ';
-$labels['importtocalendar'] = 'Bewaar in mijn kalender';
-$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
-$labels['updatemycopy'] = 'Wijzig mijn kopie';
-$labels['deleteobjectconfirm'] = 'Wilt u echt dit object verwijderen?';
-$labels['declinedeleteconfirm'] = 'Wilt u tevens deze afgewezen object verwijderen uit uw kalender?';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
+$labels['attendeetentative'] = 'Deelnemer heeft onder voorbehoud geaccepteerd';
+$labels['attendeedeclined'] = 'Deelnemer heeft afgeslagen';
+$labels['attendeedelegated'] = 'Deelnemer heeft gedelegeerd aan $delegatedto';
+$labels['attendeein-process'] = 'De deelnemer heeft de status gewijzigd in ‘In behandeling’';
+$labels['attendeecompleted'] = 'De deelnemer heeft de status gewijzigd in ‘Voltooid’';
+$labels['notanattendee'] = 'U staat niet op de lijst met deelnemers aan deze activiteit';
+$labels['outdatedinvitation'] = 'Deze uitnodiging is vervangen door een nieuwere versie';
+$labels['importtocalendar'] = 'Opslaan in mijn agenda';
+$labels['removefromcalendar'] = 'Verwijderen uit mijn agenda';
+$labels['updatemycopy'] = 'Mijn exemplaar bijwerken';
+$labels['openpreview'] = 'Voorbeeld openen';
+$labels['deleteobjectconfirm'] = 'Weet u zeker dat u dit object wilt verwijderen?';
+$labels['declinedeleteconfirm'] = 'Wilt u dit afgewezen object ook verwijderen uit uw account?';
+$labels['delegateinvitation'] = 'Uitnodiging delegeren';
+$labels['delegateto'] = 'Delegeren aan';
+$labels['delegatersvpme'] = 'Houd me op de hoogte over updates voor deze incidentie';
+$labels['delegateinvalidaddress'] = 'Voer een geldig e-mailadres voor de gedelegeerde in';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['savein'] = 'Opslaan in';
+$labels['expandattendeegroup'] = 'Vervangen door groepsleden';
+$labels['expandattendeegroupnodata'] = 'Deze groep kan niet worden vervangen. Geen leden gevonden.';
+$labels['expandattendeegrouperror'] = 'Deze groep kan niet worden vervangen. De groep bevat mogelijk te veel leden.';
+$labels['expandattendeegroupsizelimit'] = 'Deze groep bevat te veel leden om te vervangen.';
diff --git a/plugins/libcalendaring/localization/pl_PL.inc b/plugins/libcalendaring/localization/pl_PL.inc
index ce44218c..aa63214a 100644
--- a/plugins/libcalendaring/localization/pl_PL.inc
+++ b/plugins/libcalendaring/localization/pl_PL.inc
@@ -9,4 +9,8 @@
 $labels['until'] = 'dopóki';
 $labels['frequency'] = 'Powtórz';
 $labels['recurrencend'] = 'dopóki';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizator';
+$labels['statustentative'] = 'Niepewny';
+$labels['statusunknown'] = 'Nieznany';
 $labels['savingdata'] = 'Zapisuję dane...';
diff --git a/plugins/libcalendaring/localization/pt_BR.inc b/plugins/libcalendaring/localization/pt_BR.inc
index eb3f14b0..d9622f79 100644
--- a/plugins/libcalendaring/localization/pt_BR.inc
+++ b/plugins/libcalendaring/localization/pt_BR.inc
@@ -41,20 +41,28 @@ $labels['days'] = 'dia(s)';
 $labels['weeks'] = 'semana(s)';
 $labels['months'] = 'mês(es)';
 $labels['years'] = 'ano(s) em:';
+$labels['bydates'] = 'No';
 $labels['bydays'] = 'No';
+$labels['bymonths'] = 'No';
 $labels['untildate'] = 'em';
 $labels['each'] = 'Cada';
 $labels['onevery'] = 'Em cada';
 $labels['onsamedate'] = 'Na mesma data';
 $labels['forever'] = 'nunca termina';
 $labels['recurrencend'] = 'até';
-$labels['forntimes'] = 'por $nr vez(es)';
+$labels['forntimes'] = 'por $nr vez(es)'; // old
 $labels['first'] = 'primeira';
 $labels['second'] = 'segunda';
 $labels['third'] = 'terceira';
 $labels['fourth'] = 'quarta';
 $labels['last'] = 'última';
 $labels['dayofmonth'] = 'Dia do mês';
+$labels['statusorganizer'] = 'Organizador';
+$labels['statustentative'] = 'Tentativa';
+$labels['statusneeds-action'] = 'Needs action';
+$labels['statusunknown'] = 'Desconhecido';
+$labels['statuscompleted'] = 'Completed';
+$labels['statusin-process'] = 'In process';
 $labels['itipinvitation'] = 'Convite para';
 $labels['itipupdate'] = 'Atualização de';
 $labels['itipcancellation'] = 'Cancelado:';
@@ -83,3 +91,4 @@ $labels['attendeedelegated'] = 'O participante delegou para $delegatedto';
 $labels['importtocalendar'] = 'Salvar em meu calendário';
 $labels['removefromcalendar'] = 'Remover do meu calendário';
 $labels['savingdata'] = 'Salvando dados...';
+$labels['savein'] = 'Save in';
diff --git a/plugins/libcalendaring/localization/pt_PT.inc b/plugins/libcalendaring/localization/pt_PT.inc
index 2760096e..fb6c11be 100644
--- a/plugins/libcalendaring/localization/pt_PT.inc
+++ b/plugins/libcalendaring/localization/pt_PT.inc
@@ -7,6 +7,11 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
 $labels['until'] = 'até';
+$labels['alarmemailoption'] = 'Email';
 $labels['frequency'] = 'Repetir';
 $labels['recurrencend'] = 'até';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizador';
+$labels['statustentative'] = 'Tentativa';
+$labels['statusunknown'] = 'Desconhecido';
 $labels['savingdata'] = 'Salvando dados...';
diff --git a/plugins/libcalendaring/localization/ru_RU.inc b/plugins/libcalendaring/localization/ru_RU.inc
index 77d20245..73cfe8d6 100644
--- a/plugins/libcalendaring/localization/ru_RU.inc
+++ b/plugins/libcalendaring/localization/ru_RU.inc
@@ -22,8 +22,19 @@ $labels['trigger-D'] = 'дней до';
 $labels['trigger+M'] = 'минут после';
 $labels['trigger+H'] = 'часов после';
 $labels['trigger+D'] = 'дней после';
-$labels['triggerattime'] = 'в';
-$labels['addalarm'] = 'Добавить уведомление';
+$labels['triggerend-M'] = 'минут до окончания';
+$labels['triggerend-H'] = 'часов до окончания';
+$labels['triggerend-D'] = 'дней до окончания';
+$labels['triggerend+M'] = 'минут после окончания';
+$labels['triggerend+H'] = 'часов после окончания';
+$labels['triggerend+D'] = 'дней после окончания';
+$labels['trigger0'] = 'во время';
+$labels['triggerattime'] = 'в момент начала';
+$labels['triggerattimeend'] = 'в момент окончания';
+$labels['relatedstart'] = 'начало';
+$labels['relatedendevent'] = 'окончание';
+$labels['relatedendtask'] = 'срок';
+$labels['addalarm'] = 'Добавить напоминание';
 $labels['removealarm'] = 'Удалить уведомление';
 $labels['alarmtitle'] = 'Предстоящие события';
 $labels['dismissall'] = 'Отменить все';
@@ -48,7 +59,9 @@ $labels['days'] = 'день';
 $labels['weeks'] = 'неделю';
 $labels['months'] = 'месяц';
 $labels['years'] = 'год в:';
+$labels['bydates'] = 'В';
 $labels['bydays'] = 'В';
+$labels['bymonths'] = 'В';
 $labels['untildate'] = 'до';
 $labels['each'] = 'Каждого';
 $labels['onevery'] = 'В';
@@ -56,7 +69,7 @@ $labels['onsamedate'] = 'В ту же самую дату';
 $labels['forever'] = 'всегда';
 $labels['recurrencend'] = 'Повторять';
 $labels['untilenddate'] = 'до';
-$labels['forntimes'] = '$nr раз(а)';
+$labels['forntimes'] = '$nr раз(а)'; // old
 $labels['first'] = 'первый(ую)';
 $labels['second'] = 'вторый(ую)';
 $labels['third'] = 'третий(ую)';
@@ -65,6 +78,15 @@ $labels['last'] = 'последний(ую)';
 $labels['dayofmonth'] = 'День месяца';
 $labels['addrdate'] = 'Add repeat date';
 $labels['except'] = 'исключая';
+$labels['statusorganizer'] = 'Организатор';
+$labels['statusaccepted'] = 'Принято';
+$labels['statustentative'] = 'Неопределённо';
+$labels['statusdeclined'] = 'Отклонено';
+$labels['statusdelegated'] = 'Поручено';
+$labels['statusneeds-action'] = 'Требует действия';
+$labels['statusunknown'] = 'Неизвестно';
+$labels['statuscompleted'] = 'Завершенные';
+$labels['statusin-process'] = 'В процессе';
 $labels['itipinvitation'] = 'Приглашение на';
 $labels['itipupdate'] = 'Обновление';
 $labels['itipcancellation'] = 'Отменённый:';
@@ -90,8 +112,8 @@ $labels['itipsubjectdelegatedto'] = '"$title" было поручено Вам $
 $labels['itipnewattendee'] = 'Это ответ от нового участника';
 $labels['updateattendeestatus'] = 'Обновить статус участника';
 $labels['acceptinvitation'] = 'Вы принимаете это приглашение?';
-$labels['acceptattendee'] = 'Принять участника';
-$labels['declineattendee'] = 'Отказать участнику';
+$labels['acceptattendee'] = 'Добавить участника';
+$labels['declineattendee'] = 'Удалить участника';
 $labels['declineattendeeconfirm'] = 'Введите сообщение для отклонённого участника (не обязательно):';
 $labels['rsvpmodeall'] = 'Вся серия';
 $labels['rsvpmodecurrent'] = 'Только это событие';
@@ -114,7 +136,7 @@ $labels['youhavepreviouslydelegated'] = 'Вы уже делегировали э
 $labels['youhavepreviouslyin-process'] = 'Вы уже предоставили отчет о проделанной работе на это задание';
 $labels['youhavepreviouslycompleted'] = 'Вы уже завершили это задание';
 $labels['youhavepreviouslyneeds-action'] = 'Ваш ответ на это приглашение всё ещё ожидается';
-$labels['attendeeaccepted'] = 'Участник принял приглашение';
+$labels['attendeeaccepted'] = 'Участник принял';
 $labels['attendeetentative'] = 'Участник предварительно принял приглашение';
 $labels['attendeedeclined'] = 'Участник отказался от приглашения';
 $labels['attendeedelegated'] = 'Участник делегировал приглашение $delegatedto';
@@ -133,6 +155,7 @@ $labels['delegateto'] = 'Поручить';
 $labels['delegatersvpme'] = 'Сообщать мне об изменениях в этом событии';
 $labels['delegateinvalidaddress'] = 'Пожалуйста, введите правильный email адрес представителя';
 $labels['savingdata'] = 'Сохранение данных...';
+$labels['savein'] = 'Сохранить в';
 $labels['expandattendeegroup'] = 'Заменить участниками группы';
 $labels['expandattendeegroupnodata'] = 'Не удаётся заменить участниками группы. Ни одного не найдено.';
 $labels['expandattendeegrouperror'] = 'Не удаётся заменить участниками группы. Возможно, в ней слишком много участников.';
diff --git a/plugins/libcalendaring/localization/sk_SK.inc b/plugins/libcalendaring/localization/sk_SK.inc
index 66791356..39999606 100644
--- a/plugins/libcalendaring/localization/sk_SK.inc
+++ b/plugins/libcalendaring/localization/sk_SK.inc
@@ -7,3 +7,5 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
 $labels['frequency'] = 'Opakovať';
+$labels['forntimes'] = ''; // old
+$labels['statustentative'] = 'Nezáväzne';
diff --git a/plugins/libcalendaring/localization/sl_SI.inc b/plugins/libcalendaring/localization/sl_SI.inc
index 946eb618..842cb69d 100644
--- a/plugins/libcalendaring/localization/sl_SI.inc
+++ b/plugins/libcalendaring/localization/sl_SI.inc
@@ -11,5 +11,13 @@ $labels['at'] = 'ob';
 $labels['alarmemailoption'] = 'Email';
 $labels['frequency'] = 'Ponovi';
 $labels['recurrencend'] = 'do';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizator';
+$labels['statustentative'] = 'Pogojno';
+$labels['statusneeds-action'] = 'Potrebuje pozornost';
+$labels['statusunknown'] = 'Neznano';
+$labels['statuscompleted'] = 'Opravljeno';
+$labels['statusin-process'] = 'V procesu';
 $labels['itipdelegated'] = 'Sodelujoč';
 $labels['savingdata'] = 'Shranjujem...';
+$labels['savein'] = 'Shrani v';
diff --git a/plugins/libcalendaring/localization/sv_SE.inc b/plugins/libcalendaring/localization/sv_SE.inc
index bd80faf7..feb8dd36 100644
--- a/plugins/libcalendaring/localization/sv_SE.inc
+++ b/plugins/libcalendaring/localization/sv_SE.inc
@@ -9,4 +9,8 @@
 $labels['until'] = 'tills';
 $labels['frequency'] = 'Upprepa';
 $labels['recurrencend'] = 'tills';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organisatör';
+$labels['statustentative'] = 'Preliminärt';
+$labels['statusunknown'] = 'Okänd';
 $labels['savingdata'] = 'Sparar data ...';
diff --git a/plugins/libcalendaring/localization/th_TH.inc b/plugins/libcalendaring/localization/th_TH.inc
index 1fa089ab..cb1cd093 100644
--- a/plugins/libcalendaring/localization/th_TH.inc
+++ b/plugins/libcalendaring/localization/th_TH.inc
@@ -21,7 +21,6 @@ $labels['trigger-D'] = 'วัน ก่อน';
 $labels['trigger+M'] = 'นาที หลัง';
 $labels['trigger+H'] = 'ชั่วโมง หลัง';
 $labels['trigger+D'] = 'วัน หลัง';
-$labels['triggerattime'] = 'เมื่อเวลา';
 $labels['addalarm'] = 'เพิ่มการเตือน';
 $labels['removealarm'] = 'ลบการเตือน';
 $labels['alarmtitle'] = 'เหตุการณ์ที่กำลังจะถึง';
@@ -51,7 +50,7 @@ $labels['each'] = 'แต่ละ';
 $labels['forever'] = 'ตลอดไป';
 $labels['recurrencend'] = 'จนถึง';
 $labels['untilenddate'] = 'จนถึงวันที่';
-$labels['forntimes'] = 'จำนวน $nr ครั้ง';
+$labels['forntimes'] = 'จำนวน $nr ครั้ง'; // old
 $labels['first'] = 'ครั้งที่ 1';
 $labels['second'] = 'ครั้งที่ 2';
 $labels['third'] = 'ครั้งที่ 3';
@@ -59,6 +58,12 @@ $labels['fourth'] = 'ครั้งที่ 4';
 $labels['last'] = 'ครั้งสุดท้าย';
 $labels['addrdate'] = 'เพิ่มวันที่ทำซ้ำ';
 $labels['except'] = 'ยกเว้น';
+$labels['statusorganizer'] = 'ผู้จัดงาน';
+$labels['statustentative'] = 'แนวโน้ม';
+$labels['statusneeds-action'] = 'ต้องทำอะไรสักอย่าง';
+$labels['statusunknown'] = 'ไม่ทราบ';
+$labels['statuscompleted'] = 'เสร็จเรียบร้อย';
+$labels['statusin-process'] = 'อยุ่ระหว่างดำเนินการ';
 $labels['itipinvitation'] = 'คำเชิญถึง';
 $labels['itipcancellation'] = 'ยกเลิก:';
 $labels['itipreply'] = 'ตอบกลับไปยัง';
@@ -78,3 +83,4 @@ $labels['itipsubjectin-process'] = '"$title" อยู่ระหว่าง
 $labels['itipsubjectcompleted'] = '"$title" ถูกทำให้สมบูรณ์โดย $name';
 $labels['itipsubjectcancel'] = 'การเข้าร่วมของคุณใน "$title" ถูกยกเลิก';
 $labels['savingdata'] = 'บันทึกข้อมูล';
+$labels['savein'] = 'จัดเก็บใน';
diff --git a/plugins/libcalendaring/localization/uk_UA.inc b/plugins/libcalendaring/localization/uk_UA.inc
index 713cf1b7..56eefff2 100644
--- a/plugins/libcalendaring/localization/uk_UA.inc
+++ b/plugins/libcalendaring/localization/uk_UA.inc
@@ -10,5 +10,9 @@ $labels['until'] = 'до';
 $labels['alarmemailoption'] = 'Пошта';
 $labels['frequency'] = 'Повторити';
 $labels['recurrencend'] = 'до';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Організатор';
+$labels['statustentative'] = 'Невизначений';
+$labels['statusunknown'] = 'Невідомо';
 $labels['itipdelegated'] = 'Представник';
 $labels['savingdata'] = 'Збереження даних...';
diff --git a/plugins/libcalendaring/localization/vi_VN.inc b/plugins/libcalendaring/localization/vi_VN.inc
new file mode 100644
index 00000000..8a2dc5ec
--- /dev/null
+++ b/plugins/libcalendaring/localization/vi_VN.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizer';
+$labels['statustentative'] = 'Tentative';
+$labels['statusunknown'] = 'Unknown';
diff --git a/plugins/libcalendaring/localization/zh_CN.inc b/plugins/libcalendaring/localization/zh_CN.inc
index f92012b5..dbe14b7a 100644
--- a/plugins/libcalendaring/localization/zh_CN.inc
+++ b/plugins/libcalendaring/localization/zh_CN.inc
@@ -6,5 +6,27 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
+$labels['until'] = '直到';
+$labels['at'] = '在';
+$labels['alarmemail'] = '发送邮件';
+$labels['alarmdisplay'] = '显示消息';
+$labels['alarmaudio'] = '播放声音';
+$labels['alarmdisplayoption'] = '消息';
+$labels['alarmemailoption'] = '邮件';
+$labels['alarmaudiooption'] = '声音';
+$labels['alarmat'] = '在 $datetime';
+$labels['trigger-M'] = '分钟以前';
+$labels['trigger-H'] = '小时以前';
+$labels['trigger-D'] = '天以前';
+$labels['trigger+M'] = '分钟以后';
+$labels['trigger+H'] = '小时以后';
+$labels['trigger+D'] = '天以后';
+$labels['triggerend-M'] = '还有xxx分钟结束 # xxx was supposed to be the number before "minutes before end"';
 $labels['frequency'] = '循环';
+$labels['recurrencend'] = '直到';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = '组织者';
+$labels['statustentative'] = '临时';
+$labels['statusunknown'] = '未知';
 $labels['savingdata'] = '保存数据...';
+$labels['savein'] = '保存为';
diff --git a/plugins/libcalendaring/localization/zh_TW.inc b/plugins/libcalendaring/localization/zh_TW.inc
new file mode 100644
index 00000000..42ba818b
--- /dev/null
+++ b/plugins/libcalendaring/localization/zh_TW.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['until'] = 'until';
+$labels['frequency'] = 'Repeat';
+$labels['recurrencend'] = 'until';
+$labels['forntimes'] = ''; // old
+$labels['statusorganizer'] = 'Organizer';
+$labels['statustentative'] = 'Tentative';
+$labels['statusunknown'] = 'Unknown';
+$labels['savingdata'] = 'Saving data...';
diff --git a/plugins/libcalendaring/skins/larry/images/badge.png b/plugins/libcalendaring/skins/larry/images/badge.png
new file mode 100644
index 00000000..a3fd1350
Binary files /dev/null and b/plugins/libcalendaring/skins/larry/images/badge.png differ
diff --git a/plugins/libcalendaring/skins/larry/libcal.css b/plugins/libcalendaring/skins/larry/libcal.css
index f679abc3..80e0ccb1 100644
--- a/plugins/libcalendaring/skins/larry/libcal.css
+++ b/plugins/libcalendaring/skins/larry/libcal.css
@@ -118,8 +118,9 @@ label.noreply-toggle + a.reply-comment-toggle {
 	min-width: 5em;
 }
 
-#edit-recurrence-yearly-bymonthblock {
-	margin-left: 7.5em;
+.recurrence-form .event-section label + div,
+.recurrence-form .form-section label + div {
+	display: inline-block;
 }
 
 #edit-recurrence-rdates {
@@ -131,6 +132,10 @@ label.noreply-toggle + a.reply-comment-toggle {
 	overflow: auto;
 }
 
+#edit-recurrence-rdates:empty {
+	margin: 0;
+}
+
 #edit-recurrence-rdates li {
 	display: block;
 	position: relative;
@@ -140,20 +145,12 @@ label.noreply-toggle + a.reply-comment-toggle {
 
 #edit-recurrence-rdates li a.delete {
 	position: absolute;
-	top: 2px;
+	top: 5px;
 	right: 0;
-	width: 20px;
-	height: 18px;
+	width: 8px;
+	height: 16px;
 	background-position: -7px -337px;
-}
-
-#recurrence-form-until div.line {
-	margin-left: 7.5em;
-	margin-bottom: 0.3em;
-}
-
-#recurrence-form-until div.line.first {
-	margin-top: -1.4em;
+	border: 0;
 }
 
 .itip-dialog-form input.text {
@@ -164,3 +161,61 @@ label.noreply-toggle + a.reply-comment-toggle {
 	margin-left: 0;
 	margin-right: 10px;
 }
+
+.edit-attendees-table td.options a.button {
+	border: 0;
+}
+
+.ui-widget-content a.button {
+	color: #52525;
+}
+
+#event-status-badge {
+	width: 100px;
+	height: 100px;
+	position: absolute;
+	top: 0;
+	right: 0;
+	overflow: hidden;
+}
+
+#event-status-badge span {
+	display: none;
+	text-transform: uppercase;
+	width: 150px;
+	height: 20px;
+	line-height: 20px;
+	position: absolute;
+	left: -20px;
+	top: 35px;
+	padding-left: 10px;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
+	color: #fff;
+	box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc;
+	-webkit-transform: rotate(45deg);
+	-moz-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	-o-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
+.status-cancelled #event-status-badge span {
+	background: url(images/badge.png) 26px -24px no-repeat #cc0000;
+	display: block;
+}
+
+.sensitivity-private #event-status-badge span {
+	background: url(images/badge.png) 40px -52px no-repeat #0066ff;
+	display: block;
+}
+
+.sensitivity-confidential #event-status-badge span {
+	background: url(images/badge.png) 20px 2px no-repeat #cc0000;
+	display: block;
+}
+
+#edit-attendees-comment {
+	margin-top: .5em;
+}
diff --git a/plugins/libcalendaring/tests/libvcalendar.php b/plugins/libcalendaring/tests/libvcalendar.php
index d8794acf..7fca464e 100644
--- a/plugins/libcalendaring/tests/libvcalendar.php
+++ b/plugins/libcalendaring/tests/libvcalendar.php
@@ -394,6 +394,7 @@ class libvcalendar_test extends PHPUnit_Framework_TestCase
         $this->assertContains('END:VTIMEZONE', $ics, "VTIMEZONE encapsulation END");
 
         $this->assertContains('BEGIN:VEVENT',       $ics, "VEVENT encapsulation BEGIN");
+        $this->assertSame(2, substr_count($ics, 'DTSTAMP'), "Duplicate DTSTAMP (T1148)");
         $this->assertContains('UID:ac6b0aee-2519-4e5c-9a25-48c57064c9f0', $ics, "Event UID");
         $this->assertContains('SEQUENCE:' . $event['sequence'],           $ics, "Export Sequence number");
         $this->assertContains('CLASS:CONFIDENTIAL',                       $ics, "Sensitivity => Class");
diff --git a/plugins/libkolab/SQL/mysql.initial.sql b/plugins/libkolab/SQL/mysql.initial.sql
index a1497dae..0213c45b 100644
--- a/plugins/libkolab/SQL/mysql.initial.sql
+++ b/plugins/libkolab/SQL/mysql.initial.sql
@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.1
+ * @version 1.2
  * @author Thomas Bruederli
  * @licence GNU AGPL
  **/
@@ -29,7 +29,7 @@ DROP TABLE IF EXISTS `kolab_cache_contact`;
 CREATE TABLE `kolab_cache_contact` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -53,7 +53,7 @@ DROP TABLE IF EXISTS `kolab_cache_event`;
 CREATE TABLE `kolab_cache_event` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -73,7 +73,7 @@ DROP TABLE IF EXISTS `kolab_cache_task`;
 CREATE TABLE `kolab_cache_task` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -93,7 +93,7 @@ DROP TABLE IF EXISTS `kolab_cache_journal`;
 CREATE TABLE `kolab_cache_journal` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -113,7 +113,7 @@ DROP TABLE IF EXISTS `kolab_cache_note`;
 CREATE TABLE `kolab_cache_note` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -131,7 +131,7 @@ DROP TABLE IF EXISTS `kolab_cache_file`;
 CREATE TABLE `kolab_cache_file` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -151,7 +151,7 @@ DROP TABLE IF EXISTS `kolab_cache_configuration`;
 CREATE TABLE `kolab_cache_configuration` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -171,7 +171,7 @@ DROP TABLE IF EXISTS `kolab_cache_freebusy`;
 CREATE TABLE `kolab_cache_freebusy` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -188,4 +188,4 @@ CREATE TABLE `kolab_cache_freebusy` (
 
 /*!40014  SET FOREIGN_KEY_CHECKS=1 */;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2015020600');
+REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2018021300');
diff --git a/plugins/libkolab/SQL/mysql/2017071900.sql b/plugins/libkolab/SQL/mysql/2017071900.sql
new file mode 100644
index 00000000..b9ca6eb4
--- /dev/null
+++ b/plugins/libkolab/SQL/mysql/2017071900.sql
@@ -0,0 +1,9 @@
+-- make UID column bigger
+ALTER TABLE `kolab_cache_contact` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_event` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_task` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_journal` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_note` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_file` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_configuration` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
+ALTER TABLE `kolab_cache_freebusy` MODIFY `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL;
diff --git a/plugins/libkolab/SQL/mysql/2018021300.sql b/plugins/libkolab/SQL/mysql/2018021300.sql
new file mode 100644
index 00000000..9b5981d1
--- /dev/null
+++ b/plugins/libkolab/SQL/mysql/2018021300.sql
@@ -0,0 +1,9 @@
+-- accept utf8 in UID column
+ALTER TABLE `kolab_cache_contact` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_event` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_task` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_journal` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_note` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_file` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_configuration` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_freebusy` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
diff --git a/plugins/libkolab/SQL/oracle.initial.sql b/plugins/libkolab/SQL/oracle.initial.sql
index cf1fae54..78675783 100644
--- a/plugins/libkolab/SQL/oracle.initial.sql
+++ b/plugins/libkolab/SQL/oracle.initial.sql
@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.1
+ * @version 1.2
  * @author Aleksander Machniak
  * @licence GNU AGPL
  **/
@@ -33,7 +33,7 @@ CREATE TABLE "kolab_cache_contact" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -56,7 +56,7 @@ CREATE TABLE "kolab_cache_event" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -75,7 +75,7 @@ CREATE TABLE "kolab_cache_task" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -94,7 +94,7 @@ CREATE TABLE "kolab_cache_journal" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -113,7 +113,7 @@ CREATE TABLE "kolab_cache_note" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -130,7 +130,7 @@ CREATE TABLE "kolab_cache_file" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -149,7 +149,7 @@ CREATE TABLE "kolab_cache_configuration" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -168,7 +168,7 @@ CREATE TABLE "kolab_cache_freebusy" (
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -183,4 +183,4 @@ CREATE TABLE "kolab_cache_freebusy" (
 CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
 
 
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2015020600');
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2018021300');
diff --git a/plugins/libkolab/SQL/oracle/2017071900.sql b/plugins/libkolab/SQL/oracle/2017071900.sql
new file mode 100644
index 00000000..fd562669
--- /dev/null
+++ b/plugins/libkolab/SQL/oracle/2017071900.sql
@@ -0,0 +1,9 @@
+-- make UID column bigger
+ALTER TABLE "kolab_cache_contact" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_event" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_task" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_journal" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_note" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_file" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_configuration" MODIFY "uid" VARCHAR(512) NOT NULL;
+ALTER TABLE "kolab_cache_freebusy" MODIFY "uid" VARCHAR(512) NOT NULL;
diff --git a/plugins/libkolab/SQL/oracle/2018021300.sql b/plugins/libkolab/SQL/oracle/2018021300.sql
new file mode 100644
index 00000000..fe6741a0
--- /dev/null
+++ b/plugins/libkolab/SQL/oracle/2018021300.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/plugins/libkolab/SQL/sqlite.initial.sql b/plugins/libkolab/SQL/sqlite.initial.sql
index 6f6f3c9a..909188ca 100644
--- a/plugins/libkolab/SQL/sqlite.initial.sql
+++ b/plugins/libkolab/SQL/sqlite.initial.sql
@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.1
+ * @version 1.2
  * @author Thomas Bruederli
  * @licence GNU AGPL
  **/
@@ -21,7 +21,7 @@ CREATE INDEX ix_resource_type ON kolab_folders(resource, type);
 CREATE TABLE kolab_cache_contact (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -42,7 +42,7 @@ CREATE INDEX ix_contact_uid2msguid ON kolab_cache_contact(folder_id,uid,msguid);
 CREATE TABLE kolab_cache_event (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -59,7 +59,7 @@ CREATE INDEX ix_event_uid2msguid ON kolab_cache_event(folder_id,uid,msguid);
 CREATE TABLE kolab_cache_task (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -76,7 +76,7 @@ CREATE INDEX ix_task_uid2msguid ON kolab_cache_task(folder_id,uid,msguid);
 CREATE TABLE kolab_cache_journal (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -93,7 +93,7 @@ CREATE INDEX ix_journal_uid2msguid ON kolab_cache_journal(folder_id,uid,msguid);
 CREATE TABLE kolab_cache_note (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -108,7 +108,7 @@ CREATE INDEX ix_note_uid2msguid ON kolab_cache_note(folder_id,uid,msguid);
 CREATE TABLE kolab_cache_file (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -125,7 +125,7 @@ CREATE INDEX ix_file_uid2msguid ON kolab_cache_file(folder_id,uid,msguid);
 CREATE TABLE kolab_cache_configuration (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -142,7 +142,7 @@ CREATE INDEX ix_configuration_uid2msguid ON kolab_cache_configuration(folder_id,
 CREATE TABLE kolab_cache_freebusy (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -156,4 +156,4 @@ CREATE TABLE kolab_cache_freebusy (
 
 CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
 
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2015020600');
+INSERT INTO system (name, value) VALUES ('libkolab-version', '2018021300');
diff --git a/plugins/libkolab/SQL/sqlite/2017071900.sql b/plugins/libkolab/SQL/sqlite/2017071900.sql
new file mode 100644
index 00000000..d1ee0c41
--- /dev/null
+++ b/plugins/libkolab/SQL/sqlite/2017071900.sql
@@ -0,0 +1,146 @@
+TRUNCATE kolab_folders;
+DROP TABLE kolab_cache_contact;
+CREATE TABLE kolab_cache_contact (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  type VARCHAR(32) NOT NULL,
+  name VARCHAR(255) NOT NULL,
+  firstname VARCHAR(255) NOT NULL,
+  surname VARCHAR(255) NOT NULL,
+  email VARCHAR(255) NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_contact_type ON kolab_cache_contact(folder_id,type);
+CREATE INDEX ix_contact_uid2msguid ON kolab_cache_contact(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_event;
+CREATE TABLE kolab_cache_event (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_event_uid2msguid ON kolab_cache_event(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_task;
+CREATE TABLE kolab_cache_task (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_task_uid2msguid ON kolab_cache_task(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_journal;
+CREATE TABLE kolab_cache_journal (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_journal_uid2msguid ON kolab_cache_journal(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_note;
+CREATE TABLE kolab_cache_note (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_note_uid2msguid ON kolab_cache_note(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_file;
+CREATE TABLE kolab_cache_file (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  filename varchar(255) DEFAULT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_folder_filename ON kolab_cache_file(folder_id,filename);
+CREATE INDEX ix_file_uid2msguid ON kolab_cache_file(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_configuration;
+CREATE TABLE kolab_cache_configuration (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  type VARCHAR(32) NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_configuration_type ON kolab_cache_configuration(folder_id,type);
+CREATE INDEX ix_configuration_uid2msguid ON kolab_cache_configuration(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_freebusy;
+CREATE TABLE kolab_cache_freebusy (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  xml TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
diff --git a/plugins/libkolab/SQL/sqlite/2018021300.sql b/plugins/libkolab/SQL/sqlite/2018021300.sql
new file mode 100644
index 00000000..fe6741a0
--- /dev/null
+++ b/plugins/libkolab/SQL/sqlite/2018021300.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/plugins/libkolab/composer.json b/plugins/libkolab/composer.json
index 41b70ead..a2efd34f 100644
--- a/plugins/libkolab/composer.json
+++ b/plugins/libkolab/composer.json
@@ -4,7 +4,7 @@
     "description": "Plugin to setup a basic environment for the interaction with a Kolab server.",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -26,6 +26,7 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "caxy/php-htmldiff": "dev-master"
+        "pear/http_request2": "~2.3.0",
+        "caxy/php-htmldiff": "~0.1.7"
     }
 }
diff --git a/plugins/libkolab/js/audittrail.js b/plugins/libkolab/js/audittrail.js
deleted file mode 100644
index 84fdf61b..00000000
--- a/plugins/libkolab/js/audittrail.js
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * Kolab groupware audit trail utilities
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * @licstart  The following is the entire license notice for the
- * JavaScript code in this file.
- *
- * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @licend  The above is the entire license notice
- * for the JavaScript code in this file.
- */
-
-var libkolab_audittrail = {}
-
-libkolab_audittrail.quote_html = function(str)
-{
-    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-};
-
-
-// show object changelog in a dialog
-libkolab_audittrail.object_history_dialog = function(p)
-{
-    // render dialog
-    var $dialog = $(p.container);
-
-    // close show dialog first
-    if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-
-    // hide and reset changelog table
-    $dialog.find('div.notfound-message').remove();
-    $dialog.find('.changelog-table').show().children('tbody')
-        .html('<tr><td colspan="4"><span class="loading">' + rcmail.gettext('loading') + '</span></td></tr>');
-
-    // open jquery UI dialog
-    $dialog.dialog({
-        modal: false,
-        resizable: true,
-        closeOnEscape: true,
-        title: p.title,
-        open: function() {
-            $dialog.attr('aria-hidden', 'false');
-        },
-        close: function() {
-            $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-        },
-        buttons: [
-            {
-                text: rcmail.gettext('close'),
-                click: function() { $dialog.dialog('close'); },
-                autofocus: true
-            }
-        ],
-        minWidth: 450,
-        width: 650,
-        height: 350,
-        minHeight: 200
-    })
-    .show().children('.compare-button').hide();
-
-    // initialize event handlers for history dialog UI elements
-    if (!$dialog.data('initialized')) {
-      // compare button
-      $dialog.find('.compare-button input').click(function(e) {
-        var rev1 = $dialog.find('.changelog-table input.diff-rev1:checked').val(),
-          rev2 = $dialog.find('.changelog-table input.diff-rev2:checked').val();
-
-          if (rev1 && rev2 && rev1 != rev2) {
-            // swap revisions if the user got it wrong
-            if (rev1 > rev2) {
-              var tmp = rev2;
-              rev2 = rev1;
-              rev1 = tmp;
-            }
-
-            if (p.comparefunc) {
-                p.comparefunc(rev1, rev2);
-            }
-          }
-          else {
-              alert('Invalid selection!')
-          }
-
-          if (!rcube_event.is_keyboard(e) && this.blur) {
-              this.blur();
-          }
-          return false;
-      });
-
-      // delegate handlers for list actions
-      $dialog.find('.changelog-table tbody').on('click', 'td.actions a', function(e) {
-          var link = $(this),
-            action = link.hasClass('restore') ? 'restore' : 'show',
-            event = $('#eventhistory').data('event'),
-            rev = link.attr('data-rev');
-
-            // ignore clicks on first row (current revision)
-            if (link.closest('tr').hasClass('first')) {
-                return false;
-            }
-
-            // let the user confirm the restore action
-            if (action == 'restore' && !confirm(rcmail.gettext('revisionrestoreconfirm', p.module).replace('$rev', rev))) {
-                return false;
-            }
-
-            if (p.listfunc) {
-                p.listfunc(action, rev);
-            }
-
-            if (!rcube_event.is_keyboard(e) && this.blur) {
-                this.blur();
-            }
-            return false;
-      })
-      .on('click', 'input.diff-rev1', function(e) {
-          if (!this.checked) return true;
-
-          var rev1 = this.value, selection_valid = false;
-          $dialog.find('.changelog-table input.diff-rev2').each(function(i, elem) {
-              $(elem).prop('disabled', elem.value <= rev1);
-              if (elem.checked && elem.value > rev1) {
-                  selection_valid = true;
-              }
-          });
-          if (!selection_valid) {
-              $dialog.find('.changelog-table input.diff-rev2:not([disabled])').last().prop('checked', true);
-          }
-      });
-
-      $dialog.addClass('changelog-dialog').data('initialized', true);
-    }
-
-    return $dialog;
-};
-
-// callback from server with changelog data
-libkolab_audittrail.render_changelog = function(data, object, folder)
-{
-    var Q = libkolab_audittrail.quote_html;
-
-    var $dialog = $('.changelog-dialog')
-    if (data === false || !data.length) {
-        return false;
-    }
-
-    var i, change, accessible, op_append,
-      first = data.length - 1, last = 0,
-      is_writeable = !!folder.editable,
-      op_labels = {
-          RECEIVE:   'actionreceive',
-          APPEND:    'actionappend',
-          MOVE:      'actionmove',
-          DELETE:    'actiondelete',
-          READ:      'actionread',
-          FLAGSET:   'actionflagset',
-          FLAGCLEAR: 'actionflagclear'
-      },
-      actions = '<a href="#show" class="iconbutton preview" title="'+ rcmail.gettext('showrevision','libkolab') +'" data-rev="{rev}" /> ' +
-          (is_writeable ? '<a href="#restore" class="iconbutton restore" title="'+ rcmail.gettext('restore','libkolab') + '" data-rev="{rev}" />' : ''),
-      tbody = $dialog.find('.changelog-table tbody').html('');
-
-    for (i=first; i >= 0; i--) {
-        change = data[i];
-        accessible = change.date && change.user;
-
-        if (change.op == 'MOVE' && change.mailbox) {
-            op_append = ' ⇢ ' + change.mailbox;
-        }
-        else if ((change.op == 'FLAGSET' || change.op == 'FLAGCLEAR') && change.flags) {
-            op_append = ': ' + change.flags;
-        }
-        else {
-            op_append = '';
-        }
-
-        $('<tr class="' + (i == first ? 'first' : (i == last ? 'last' : '')) + (accessible ? '' : 'undisclosed') + '">')
-            .append('<td class="diff">' + (accessible && change.op != 'DELETE' ? 
-                '<input type="radio" name="rev1" class="diff-rev1" value="' + change.rev + '" title="" '+ (i == last ? 'checked="checked"' : '') +' /> '+
-                '<input type="radio" name="rev2" class="diff-rev2" value="' + change.rev + '" title="" '+ (i == first ? 'checked="checked"' : '') +' /></td>'
-                : ''))
-            .append('<td class="revision">' + Q(i+1) + '</td>')
-            .append('<td class="date">' + Q(change.date || '') + '</td>')
-            .append('<td class="user">' + Q(change.user || 'undisclosed') + '</td>')
-            .append('<td class="operation" title="' + op_append + '">' + Q(rcmail.gettext(op_labels[change.op] || '', 'libkolab') + op_append) + '</td>')
-            .append('<td class="actions">' + (accessible && change.op != 'DELETE' ? actions.replace(/\{rev\}/g, change.rev) : '') + '</td>')
-            .appendTo(tbody);
-    }
-
-    if (first > 0) {
-        $dialog.find('.compare-button').fadeIn(200);
-        $dialog.find('.changelog-table tr.last input.diff-rev1').click();
-    }
-
-    // set dialog size according to content
-    libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height() + 15, 600);
-
-    return $dialog;
-};
-
-// resize and reposition (center) the dialog window
-libkolab_audittrail.dialog_resize = function(id, height, width)
-{
-    var win = $(window), w = win.width(), h = win.height();
-        $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) })
-            .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
-};
-
-
-// register handlers for mail message history
-window.rcmail && rcmail.addEventListener('init', function(e) {
-    var loading_lock;
-
-    if (rcmail.env.task == 'mail') {
-        rcmail.register_command('kolab-mail-history', function() {
-            var dialog, uid = rcmail.get_single_uid(), rec = { uid: uid, mbox: rcmail.get_message_mailbox(uid) };
-            if (!uid || !window.libkolab_audittrail) {
-                return false;
-            }
-
-            // render dialog
-            $dialog = libkolab_audittrail.object_history_dialog({
-                module: 'libkolab',
-                container: '#mailmessagehistory',
-                title: rcmail.gettext('objectchangelog','libkolab')
-            });
-
-            $dialog.data('rec', rec);
-
-            // fetch changelog data
-            loading_lock = rcmail.set_busy(true, 'loading', loading_lock);
-            rcmail.http_post('plugin.message-changelog', { _uid: rec.uid, _mbox: rec.mbox }, loading_lock);
-
-        }, rcmail.env.action == 'show');
-
-        rcmail.addEventListener('plugin.message_render_changelog', function(data) {
-            var $dialog = $('#mailmessagehistory'),
-                rec = $dialog.data('rec');
-
-            if (data === false || !data.length || !rec) {
-              // display 'unavailable' message
-              $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','libkolab') + '</div>')
-                  .insertBefore($dialog.find('.changelog-table').hide());
-              return;
-            }
-
-            data.module = 'libkolab';
-            libkolab_audittrail.render_changelog(data, rec, {});
-        });
-
-        rcmail.env.message_commands.push('kolab-mail-history');
-    }
-});
diff --git a/plugins/libkolab/lib/kolab_attachments_handler.php b/plugins/libkolab/lib/kolab_attachments_handler.php
new file mode 100644
index 00000000..d38739e6
--- /dev/null
+++ b/plugins/libkolab/lib/kolab_attachments_handler.php
@@ -0,0 +1,370 @@
+<?php
+
+/**
+ * Shared code for attachments handling in Kolab plugins
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_attachments_handler
+{
+    private $rc;
+    private $attachment;
+
+    public function __construct()
+    {
+        $this->rc = rcmail::get_instance();
+    }
+
+    public static function ui()
+    {
+        $rcmail = rcmail::get_instance();
+        $self   = new self;
+
+        $rcmail->output->add_handler('plugin.attachments_form', array($self, 'files_form'));
+        $rcmail->output->add_handler('plugin.attachments_list', array($self, 'files_list'));
+        $rcmail->output->add_handler('plugin.filedroparea', array($self, 'files_drop_area'));
+    }
+
+    /**
+     * Generate HTML element for attachments list
+     */
+    public function files_list($attrib = array())
+    {
+        if (!$attrib['id']) {
+            $attrib['id'] = 'kolabattachmentlist';
+        }
+
+        // define list of file types which can be displayed inline
+        // same as in program/steps/mail/show.inc
+        $this->rc->output->set_env('mimetypes', (array)$this->rc->config->get('client_mimetypes'));
+
+        $this->rc->output->add_gui_object('attachmentlist', $attrib['id']);
+
+        return html::tag('ul', $attrib, '', html::$common_attrib);
+    }
+
+    /**
+     * Generate the form for event attachments upload
+     */
+    public function files_form($attrib = array())
+    {
+        // add ID if not given
+        if (!$attrib['id']) {
+            $attrib['id'] = 'kolabuploadform';
+        }
+
+        return $this->rc->upload_form($attrib, 'uploadform', 'upload-file', array('multiple' => true));
+    }
+
+    /**
+     * Register UI object for HTML5 drag & drop file upload
+     */
+    public function files_drop_area($attrib = array())
+    {
+        // add ID if not given
+        if (!$attrib['id']) {
+            $attrib['id'] = 'kolabfiledroparea';
+        }
+
+        $this->rc->output->add_gui_object('filedrop', $attrib['id']);
+        $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
+    }
+
+    /**
+     * Displays attachment preview page
+     */
+    public function attachment_page($attachment)
+    {
+        $this->attachment = $attachment;
+
+        $this->rc->plugins->include_script('libkolab/libkolab.js');
+
+        $this->rc->output->add_handler('plugin.attachmentframe', array($this, 'attachment_frame'));
+        $this->rc->output->add_handler('plugin.attachmentcontrols', array($this, 'attachment_header'));
+        $this->rc->output->set_env('filename', $attachment['name']);
+        $this->rc->output->set_env('mimetype', $attachment['mimetype']);
+        $this->rc->output->send('libkolab.attachment');
+    }
+
+    /**
+     * Handler for attachment uploads
+     */
+    public function attachment_upload($session_key, $id_prefix = '')
+    {
+        // Upload progress update
+        if (!empty($_GET['_progress'])) {
+            $this->rc->upload_progress();
+        }
+
+        $recid    = $id_prefix . rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+        $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC);
+
+        if (!is_array($_SESSION[$session_key]) || $_SESSION[$session_key]['id'] != $recid) {
+            $_SESSION[$session_key] = array();
+            $_SESSION[$session_key]['id'] = $recid;
+            $_SESSION[$session_key]['attachments'] = array();
+        }
+
+        // clear all stored output properties (like scripts and env vars)
+        $this->rc->output->reset();
+
+        if (is_array($_FILES['_attachments']['tmp_name'])) {
+            foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
+                // Process uploaded attachment if there is no error
+                $err = $_FILES['_attachments']['error'][$i];
+
+                if (!$err) {
+                    $filename   = $_FILES['_attachments']['name'][$i];
+                    $attachment = array(
+                        'path'     => $filepath,
+                        'size'     => $_FILES['_attachments']['size'][$i],
+                        'name'     => $filename,
+                        'mimetype' => rcube_mime::file_content_type($filepath, $filename, $_FILES['_attachments']['type'][$i]),
+                        'group'    => $recid,
+                    );
+
+                    $attachment = $this->rc->plugins->exec_hook('attachment_upload', $attachment);
+                }
+
+                if (!$err && $attachment['status'] && !$attachment['abort']) {
+                    $id = $attachment['id'];
+
+                    // store new attachment in session
+                    unset($attachment['status'], $attachment['abort']);
+                    $this->rc->session->append($session_key . '.attachments', $id, $attachment);
+
+                    if (($icon = $_SESSION[$session_key . '_deleteicon']) && is_file($icon)) {
+                        $button = html::img(array(
+                            'src' => $icon,
+                            'alt' => $this->rc->gettext('delete')
+                        ));
+                    }
+                    else if ($_SESSION[$session_key . '_textbuttons']) {
+                        $button = rcube::Q($this->rc->gettext('delete'));
+                    }
+                    else {
+                        $button = '';
+                    }
+
+                    $link_content = sprintf('<span class="attachment-name">%s</span><span class="attachment-size">(%s)</span>',
+                        rcube::Q($attachment['name']), $this->rc->show_bytes($attachment['size']));
+
+                    $delete_link = html::a(array(
+                            'href'       => "#delete",
+                            'class'      => 'delete',
+                            'onclick'    => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", rcmail_output::JS_OBJECT_NAME, $id),
+                            'title'      => $this->rc->gettext('delete'),
+                            'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
+                        ), $button);
+
+                    $content_link = html::a(array(
+                            'href'    => "#load",
+                            'class'   => 'filename',
+                            'onclick' => 'return false', // sprintf("return %s.command('load-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
+                         ), $link_content);
+
+                    $content .= $_SESSION[$session_key . '_icon_pos'] == 'left' ? $delete_link.$content_link : $content_link.$delete_link;
+
+                    $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
+                            'html'      => $content,
+                            'name'      => $attachment['name'],
+                            'mimetype'  => $attachment['mimetype'],
+                            'classname' => 'no-menu ' . rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
+                            'complete'  => true
+                        ), $uploadid);
+                }
+                else {  // upload failed
+                    if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                        $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
+                            'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+                    }
+                    else if ($attachment['error']) {
+                        $msg = $attachment['error'];
+                    }
+                    else {
+                        $msg = $this->rc->gettext('fileuploaderror');
+                    }
+
+                    $this->rc->output->command('display_message', $msg, 'error');
+                    $this->rc->output->command('remove_from_attachment_list', $uploadid);
+                }
+            }
+        }
+        else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            // if filesize exceeds post_max_size then $_FILES array is empty,
+            // show filesizeerror instead of fileuploaderror
+            if ($maxsize = ini_get('post_max_size'))
+                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
+                    'size' => $this->rc->show_bytes(parse_bytes($maxsize)))));
+            else
+                $msg = $this->rc->gettext('fileuploaderror');
+
+            $this->rc->output->command('display_message', $msg, 'error');
+            $this->rc->output->command('remove_from_attachment_list', $uploadid);
+        }
+
+        $this->rc->output->send('iframe');
+    }
+
+
+    /**
+     * Deliver an event/task attachment to the client
+     * (similar as in Roundcube core program/steps/mail/get.inc)
+     */
+    public function attachment_get($attachment)
+    {
+        ob_end_clean();
+
+        if ($attachment && $attachment['body']) {
+            // allow post-processing of the attachment body
+            $part = new rcube_message_part;
+            $part->filename  = $attachment['name'];
+            $part->size      = $attachment['size'];
+            $part->mimetype  = $attachment['mimetype'];
+
+            $plugin = $this->rc->plugins->exec_hook('message_part_get', array(
+                'body'     => $attachment['body'],
+                'mimetype' => strtolower($attachment['mimetype']),
+                'download' => !empty($_GET['_download']),
+                'part'     => $part,
+            ));
+
+            if ($plugin['abort'])
+                exit;
+
+            $mimetype = $plugin['mimetype'];
+            list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
+
+            $browser = $this->rc->output->browser;
+
+            // send download headers
+            if ($plugin['download']) {
+                header("Content-Type: application/octet-stream");
+                if ($browser->ie)
+                    header("Content-Type: application/force-download");
+            }
+            else if ($ctype_primary == 'text') {
+                header("Content-Type: text/$ctype_secondary");
+            }
+            else {
+                header("Content-Type: $mimetype");
+                header("Content-Transfer-Encoding: binary");
+            }
+
+            // display page, @TODO: support text/plain (and maybe some other text formats)
+            if ($mimetype == 'text/html' && empty($_GET['_download'])) {
+                $OUTPUT = new rcmail_html_page();
+                // @TODO: use washtml on $body
+                $OUTPUT->write($plugin['body']);
+            }
+            else {
+                // don't kill the connection if download takes more than 30 sec.
+                @set_time_limit(0);
+
+                $filename = $attachment['name'];
+                $filename = preg_replace('[\r\n]', '', $filename);
+
+                if ($browser->ie && $browser->ver < 7)
+                    $filename = rawurlencode(abbreviate_string($filename, 55));
+                else if ($browser->ie)
+                    $filename = rawurlencode($filename);
+                else
+                    $filename = addcslashes($filename, '"');
+
+                $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
+                header("Content-Disposition: $disposition; filename=\"$filename\"");
+
+                echo $plugin['body'];
+            }
+
+            exit;
+        }
+
+        // if we arrive here, the requested part was not found
+        header('HTTP/1.1 404 Not Found');
+        exit;
+    }
+
+    /**
+     * Show "loading..." page in attachment iframe
+     */
+    public function attachment_loading_page()
+    {
+        $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
+        $message = $this->rc->gettext('loadingdata');
+
+        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
+        print "<html>\n<head>\n"
+            . '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
+            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
+            . "</head>\n<body>\n$message\n</body>\n</html>";
+        exit;
+    }
+
+    /**
+     * Template object for attachment display frame
+     */
+    public function attachment_frame($attrib = array())
+    {
+        $mimetype = strtolower($this->attachment['mimetype']);
+        list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
+
+        $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary == 'text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
+
+        $this->rc->output->add_gui_object('attachmentframe', $attrib['id']);
+
+        return html::iframe($attrib);
+    }
+
+    /**
+     *
+     */
+    public function attachment_header($attrib = array())
+    {
+        $rcmail  = rcmail::get_instance();
+        $dl_link = strtolower($attrib['downloadlink']) == 'true';
+        $dl_url  = $this->rc->url(array('_frame' => null, '_download' => 1) + $_GET);
+        $table   = new html_table(array('cols' => $dl_link ? 3 : 2));
+
+        if (!empty($this->attachment['name'])) {
+            $table->add('title', rcube::Q($this->rc->gettext('filename')));
+            $table->add('header', rcube::Q($this->attachment['name']));
+
+            if ($dl_link) {
+                $table->add('download-link', html::a($dl_url, rcube::Q($this->rc->gettext('download'))));
+            }
+        }
+
+        if (!empty($this->attachment['mimetype'])) {
+            $table->add('title', rcube::Q($this->rc->gettext('type')));
+            $table->add('header', rcube::Q($this->attachment['mimetype']));
+        }
+
+        if (!empty($this->attachment['size'])) {
+            $table->add('title', rcube::Q($this->rc->gettext('filesize')));
+            $table->add('header', rcube::Q($this->rc->show_bytes($this->attachment['size'])));
+        }
+
+        $this->rc->output->set_env('attachment_download_url', $dl_url);
+
+        return $table->show($attrib);
+    }
+}
diff --git a/plugins/libkolab/lib/kolab_date_recurrence.php b/plugins/libkolab/lib/kolab_date_recurrence.php
index f2483c96..2ec06c8a 100644
--- a/plugins/libkolab/lib/kolab_date_recurrence.php
+++ b/plugins/libkolab/lib/kolab_date_recurrence.php
@@ -9,7 +9,7 @@
  * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012-2016, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -36,7 +36,7 @@ class kolab_date_recurrence
     /**
      * Default constructor
      *
-     * @param array The Kolab object to operate on
+     * @param kolab_format_xcal The Kolab object to operate on
      */
     function __construct($object)
     {
@@ -44,13 +44,17 @@ class kolab_date_recurrence
 
         $this->object = $object;
         $this->engine = $object->to_libcal();
-        $this->start = $this->next = $data['start'];
-        $this->cnext = kolab_format::get_datetime($this->next);
+        $this->start  = $this->next = $data['start'];
+        $this->cnext  = kolab_format::get_datetime($this->next);
 
-        if (is_object($data['start']) && is_object($data['end']))
+        if (is_object($data['start']) && is_object($data['end'])) {
             $this->duration = $data['start']->diff($data['end']);
-        else
-            $this->duration = new DateInterval('PT' . ($data['end'] - $data['start']) . 'S');
+        }
+        else {
+            // Prevent from errors when end date is not set (#5307) RFC5545 3.6.1
+            $seconds = !empty($data['end']) ? ($data['end'] - $data['start']) : 0;
+            $this->duration = new DateInterval('PT' . $seconds . 'S');
+        }
     }
 
     /**
@@ -67,8 +71,9 @@ class kolab_date_recurrence
             if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
                 $next = kolab_format::php_datetime($cnext);
                 $time = $timestamp ? $next->format('U') : $next;
+
                 $this->cnext = $cnext;
-                $this->next = $next;
+                $this->next  = $next;
             }
         }
 
@@ -86,13 +91,13 @@ class kolab_date_recurrence
             $next_end = clone $next_start;
             $next_end->add($this->duration);
 
-            $next = $this->object->to_array();
+            $next          = $this->object->to_array();
             $next['start'] = $next_start;
-            $next['end'] = $next_end;
+            $next['end']   = $next_end;
 
-            $recurrence_id_format = libkolab::recurrence_id_format($next);
+            $recurrence_id_format    = libkolab::recurrence_id_format($next);
             $next['recurrence_date'] = clone $next_start;
-            $next['_instance'] = $next_start->format($recurrence_id_format);
+            $next['_instance']       = $next_start->format($recurrence_id_format);
 
             unset($next['_formatobj']);
 
@@ -117,23 +122,111 @@ class kolab_date_recurrence
         }
 
         // let libkolab do the work
-        if ($this->engine && ($cend = $this->engine->getLastOccurrence()) && ($end_dt = kolab_format::php_datetime(new cDateTime($cend)))) {
+        if ($this->engine && ($cend = $this->engine->getLastOccurrence())
+            && ($end_dt = kolab_format::php_datetime(new cDateTime($cend)))
+        ) {
             return $end_dt;
         }
 
         // determine a reasonable end date if none given
         if (!$event['recurrence']['COUNT'] && $event['end'] instanceof DateTime) {
-          switch ($event['recurrence']['FREQ']) {
-            case 'YEARLY':  $intvl = 'P100Y'; break;
-            case 'MONTHLY': $intvl = 'P20Y';  break;
-            default:        $intvl = 'P10Y';  break;
-          }
+            $end_dt = clone $event['end'];
+            $end_dt->add(new DateInterval('P100Y'));
 
-          $end_dt = clone $event['end'];
-          $end_dt->add(new DateInterval($intvl));
-          return $end_dt;
+            return $end_dt;
         }
 
         return false;
     }
+
+    /**
+     * Find date/time of the first occurrence
+     */
+    public function first_occurrence()
+    {
+        $event      = $this->object->to_array();
+        $start      = clone $this->start;
+        $orig_start = clone $this->start;
+        $interval   = intval($event['recurrence']['INTERVAL'] ?: 1);
+
+        switch ($event['recurrence']['FREQ']) {
+        case 'WEEKLY':
+            if (empty($event['recurrence']['BYDAY'])) {
+                return $orig_start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}W"));
+            break;
+
+        case 'MONTHLY':
+            if (empty($event['recurrence']['BYDAY']) && empty($event['recurrence']['BYMONTHDAY'])) {
+                return $orig_start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}M"));
+            break;
+
+        case 'YEARLY':
+            if (empty($event['recurrence']['BYDAY']) && empty($event['recurrence']['BYMONTH'])) {
+                return $orig_start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}Y"));
+            break;
+
+        case 'DAILY':
+            if (!empty($event['recurrence']['BYMONTH'])) {
+                break;
+            }
+
+        default:
+            return $orig_start;
+        }
+
+        $event['start'] = $start;
+        $event['recurrence']['INTERVAL'] = $interval;
+        if ($event['recurrence']['COUNT']) {
+            // Increase count so we do not stop the loop to early
+            $event['recurrence']['COUNT'] += 100;
+        }
+
+        // Create recurrence that starts in the past
+        $object_type = $this->object instanceof kolab_format_task ? 'task' : 'event';
+        $object      = kolab_format::factory($object_type, 3.0);
+        $object->set($event);
+        $recurrence = new self($object);
+
+        $orig_date = $orig_start->format('Y-m-d');
+        $found     = false;
+
+        // find the first occurrence
+        while ($next = $recurrence->next_start()) {
+            $start = $next;
+            if ($next->format('Y-m-d') >= $orig_date) {
+                if ($event['allday']) {
+                    $next->setTime($orig_start->format('G'), $orig_start->format('i'), $orig_start->format('s'));
+                }
+
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            rcube::raise_error(array(
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => sprintf("Failed to find a first occurrence. Start: %s, Recurrence: %s",
+                    $orig_start->format(DateTime::ISO8601), json_encode($event['recurrence'])),
+            ), true);
+
+            return null;
+        }
+
+        if ($event['allday']) {
+            $start->_dateonly = true;
+        }
+
+        return $start;
+    }
 }
diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index 5041dd38..cde67fad 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -203,17 +203,20 @@ abstract class kolab_format
      * @param mixed         Date/Time value either as unix timestamp, date string or PHP DateTime object
      * @param DateTimeZone  The timezone the date/time is in. Use global default if Null, local time if False
      * @param boolean       True of the given date has no time component
-     * @return object       The libkolabxml date/time object
+     * @param DateTimeZone  The timezone to convert the date to before converting to cDateTime
+     *
+     * @return cDateTime The libkolabxml date/time object
      */
-    public static function get_datetime($datetime, $tz = null, $dateonly = false)
+    public static function get_datetime($datetime, $tz = null, $dateonly = false, $dest_tz = null)
     {
-        // use timezone information from datetime of global setting
+        // use timezone information from datetime or global setting
         if (!$tz && $tz !== false) {
             if ($datetime instanceof DateTime)
                 $tz = $datetime->getTimezone();
             if (!$tz)
                 $tz = self::$timezone;
         }
+
         $result = new cDateTime();
 
         try {
@@ -225,16 +228,31 @@ abstract class kolab_format
             else if (is_string($datetime) && strlen($datetime)) {
                 $datetime = $tz ? new DateTime($datetime, $tz) : new DateTime($datetime);
             }
+            else if ($datetime instanceof DateTime) {
+                $datetime = clone $datetime;
+            }
         }
         catch (Exception $e) {}
 
         if ($datetime instanceof DateTime) {
+            if ($dest_tz instanceof DateTimeZone && $dest_tz !== $datetime->getTimezone()) {
+                $datetime->setTimezone($dest_tz);
+                $tz = $dest_tz;
+            }
+
             $result->setDate($datetime->format('Y'), $datetime->format('n'), $datetime->format('j'));
 
-            if (!$dateonly)
-                $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
+            if ($dateonly) {
+                // Dates should be always in local time only
+                return $result;
+            }
 
-            if ($tz && in_array($tz->getName(), array('UTC', 'GMT', '+00:00', 'Z'))) {
+            $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
+
+            // libkolabxml throws errors on some deprecated timezone names
+            $utc_aliases = array('UTC', 'GMT', '+00:00', 'Z', 'Etc/GMT', 'Etc/UTC');
+
+            if ($tz && in_array($tz->getName(), $utc_aliases)) {
                 $result->setUTC(true);
             }
             else if ($tz !== false) {
@@ -251,16 +269,19 @@ abstract class kolab_format
     /**
      * Convert the given cDateTime into a PHP DateTime object
      *
-     * @param object cDateTime  The libkolabxml datetime object
-     * @return object DateTime  PHP datetime instance
+     * @param cDateTime    The libkolabxml datetime object
+     * @param DateTimeZone The timezone to convert the date to
+     *
+     * @return DateTime PHP datetime instance
      */
-    public static function php_datetime($cdt)
+    public static function php_datetime($cdt, $dest_tz = null)
     {
-        if (!is_object($cdt) || !$cdt->isValid())
+        if (!is_object($cdt) || !$cdt->isValid()) {
             return null;
+        }
 
         $d = new DateTime;
-        $d->setTimezone(self::$timezone);
+        $d->setTimezone($dest_tz ?: self::$timezone);
 
         try {
             if ($tzs = $cdt->timezone()) {
@@ -520,11 +541,12 @@ abstract class kolab_format
             $this->obj->setUid($object['uid']);
 
         // set some automatic values if missing
-        if (empty($object['created']) && method_exists($this->obj, 'setCreated')) {
-            $cdt = $this->obj->created();
-            $object['created'] = $cdt && $cdt->isValid() ? self::php_datetime($cdt) : new DateTime('now', new DateTimeZone('UTC'));
-            if (!$cdt || !$cdt->isValid())
-                $this->obj->setCreated(self::get_datetime($object['created']));
+        if (method_exists($this->obj, 'setCreated')) {
+            // Always set created date to workaround libkolabxml (>1.1.4) bug
+            $created = $object['created'] ?: new DateTime('now');
+            $created->setTimezone(new DateTimeZone('UTC')); // must be UTC
+            $this->obj->setCreated(self::get_datetime($created));
+            $object['created'] = $created;
         }
 
         $object['changed'] = new DateTime('now', new DateTimeZone('UTC'));
@@ -704,4 +726,68 @@ abstract class kolab_format
             $this->obj->setAttachments($vattach);
         }
     }
+
+    /**
+     * Unified way of updating/deleting attachments of edited object
+     *
+     * @param array $object Kolab object data
+     * @param array $old    Old version of Kolab object
+     */
+    public static function merge_attachments(&$object, $old)
+    {
+        $object['_attachments'] = (array) $old['_attachments'];
+
+        // delete existing attachment(s)
+        if (!empty($object['deleted_attachments'])) {
+            foreach ($object['_attachments'] as $idx => $att) {
+                if ($object['deleted_attachments'] === true || in_array($att['id'], $object['deleted_attachments'])) {
+                    $object['_attachments'][$idx] = false;
+                }
+            }
+        }
+
+        // in kolab_storage attachments are indexed by content-id
+        foreach ((array) $object['attachments'] as $attachment) {
+            $key = null;
+
+            // Roundcube ID has nothing to do with the storage ID, remove it
+            // for uploaded/new attachments
+            // FIXME: Roundcube uses 'data', kolab_format uses 'content'
+            if ($attachment['content'] || $attachment['path'] || $attachment['data']) {
+                unset($attachment['id']);
+            }
+
+            if ($attachment['id']) {
+                foreach ((array) $object['_attachments'] as $cid => $att) {
+                    if ($att && $attachment['id'] == $att['id']) {
+                        $key = $cid;
+                    }
+                }
+            }
+            else {
+                // find attachment by name, so we can update it if exists
+                // and make sure there are no duplicates
+                foreach ((array) $object['_attachments'] as $cid => $att) {
+                    if ($att && $attachment['name'] == $att['name']) {
+                        $key = $cid;
+                    }
+                }
+            }
+
+            if ($key && $attachment['_deleted']) {
+                $object['_attachments'][$key] = false;
+            }
+            // replace existing entry
+            else if ($key) {
+                $object['_attachments'][$key] = $attachment;
+            }
+            // append as new attachment
+            else {
+                $object['_attachments'][] = $attachment;
+            }
+        }
+
+        unset($object['attachments']);
+        unset($object['deleted_attachments']);
+    }
 }
diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index a40f1798..e8393a42 100644
--- a/plugins/libkolab/lib/kolab_format_event.php
+++ b/plugins/libkolab/lib/kolab_format_event.php
@@ -49,29 +49,6 @@ class kolab_format_event extends kolab_format_xcal
         $this->_scheduling_properties = self::$scheduling_properties;
     }
 
-    /**
-     * Clones into an instance of libcalendaring's extended EventCal class
-     *
-     * @return mixed EventCal object or false on failure
-     */
-    public function to_libcal()
-    {
-        static $error_logged = false;
-
-        if (class_exists('kolabcalendaring')) {
-            return new EventCal($this->obj);
-        }
-        else if (!$error_logged) {
-            $error_logged = true;
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "required kolabcalendaring module not found"
-            ), true);
-        }
-
-        return false;
-    }
-
     /**
      * Set event properties to the kolabformat object
      *
@@ -191,6 +168,10 @@ class kolab_format_event extends kolab_format_xcal
             $object['end'] = clone $object['start'];
             $object['end']->add($interval);
         }
+        // make sure end date is specified (#5307) RFC5545 3.6.1
+        else if (!$object['end'] && $object['start']) {
+            $object['end'] = clone $object['start'];
+        }
 
         // organizer is part of the attendees list in Roundcube
         if ($object['organizer']) {
@@ -310,7 +291,9 @@ class kolab_format_event extends kolab_format_xcal
         }
 
         // preserve this property for date serialization
-        $exception['allday'] = $master['allday'];
+        if (!isset($exception['allday'])) {
+            $exception['allday'] = $master['allday'];
+        }
 
         return $exception;
     }
@@ -323,7 +306,7 @@ class kolab_format_event extends kolab_format_xcal
         // Note: If an exception has no attendees it means there's "no attendees
         // for this occurrence", not "attendees are the same as in the event" (#5300)
 
-        $forbidden    = array('exceptions', 'attendees');
+        $forbidden    = array('exceptions', 'attendees', 'allday');
         $is_recurring = !empty($master['recurrence']);
 
         foreach ($master as $prop => $value) {
diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index a9dd70c8..a08d0aa0 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -92,12 +92,14 @@ abstract class kolab_format_xcal extends kolab_format
     );
 
     protected $part_status_map = array(
-        'UNKNOWN' => kolabformat::PartNeedsAction,
+        'UNKNOWN'      => kolabformat::PartNeedsAction,
         'NEEDS-ACTION' => kolabformat::PartNeedsAction,
-        'TENTATIVE' => kolabformat::PartTentative,
-        'ACCEPTED' => kolabformat::PartAccepted,
-        'DECLINED' => kolabformat::PartDeclined,
-        'DELEGATED' => kolabformat::PartDelegated,
+        'TENTATIVE'    => kolabformat::PartTentative,
+        'ACCEPTED'     => kolabformat::PartAccepted,
+        'DECLINED'     => kolabformat::PartDeclined,
+        'DELEGATED'    => kolabformat::PartDelegated,
+        'IN-PROCESS'   => kolabformat::PartInProcess,
+        'COMPLETED'    => kolabformat::PartCompleted,
       );
 
 
@@ -172,6 +174,10 @@ abstract class kolab_format_xcal extends kolab_format
             }
         }
 
+        if ($object['start'] instanceof DateTime) {
+            $start_tz = $object['start']->getTimezone();
+        }
+
         // read recurrence rule
         if (($rr = $this->obj->recurrenceRule()) && $rr->isValid()) {
             $rrule_type_map = array_flip($this->rrule_type_map);
@@ -183,7 +189,7 @@ abstract class kolab_format_xcal extends kolab_format
             if (($count = $rr->count()) && $count > 0) {
                 $object['recurrence']['COUNT'] = $count;
             }
-            else if ($until = self::php_datetime($rr->end())) {
+            else if ($until = self::php_datetime($rr->end(), $start_tz)) {
                 $refdate = $this->get_reference_date();
                 if ($refdate && $refdate instanceof DateTime && !$refdate->_dateonly) {
                     $until->setTime($refdate->format('G'), $refdate->format('i'), 0);
@@ -212,16 +218,18 @@ abstract class kolab_format_xcal extends kolab_format
 
             if ($exdates = $this->obj->exceptionDates()) {
                 for ($i=0; $i < $exdates->size(); $i++) {
-                    if ($exdate = self::php_datetime($exdates->get($i)))
+                    if ($exdate = self::php_datetime($exdates->get($i), $start_tz)) {
                         $object['recurrence']['EXDATE'][] = $exdate;
+                    }
                 }
             }
         }
 
         if ($rdates = $this->obj->recurrenceDates()) {
             for ($i=0; $i < $rdates->size(); $i++) {
-                if ($rdate = self::php_datetime($rdates->get($i)))
+                if ($rdate = self::php_datetime($rdates->get($i), $start_tz)) {
                     $object['recurrence']['RDATE'][] = $rdate;
+                }
             }
         }
 
@@ -413,12 +421,19 @@ abstract class kolab_format_xcal extends kolab_format
             $this->obj->setOrganizer($organizer);
         }
 
+        if ($object['start'] instanceof DateTime) {
+            $start_tz = $object['start']->getTimezone();
+        }
+
         // save recurrence rule
         $rr = new RecurrenceRule;
         $rr->setFrequency(RecurrenceRule::FreqNone);
 
         if ($object['recurrence'] && !empty($object['recurrence']['FREQ'])) {
-            $rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
+            $freq     = $object['recurrence']['FREQ'];
+            $bysetpos = explode(',', $object['recurrence']['BYSETPOS']);
+
+            $rr->setFrequency($this->rrule_type_map[$freq]);
 
             if ($object['recurrence']['INTERVAL'])
                 $rr->setInterval(intval($object['recurrence']['INTERVAL']));
@@ -431,8 +446,19 @@ abstract class kolab_format_xcal extends kolab_format
                         $occurrence = intval($m[1]);
                         $day = $m[2];
                     }
-                    if (isset($this->weekday_map[$day]))
-                        $byday->push(new DayPos($occurrence, $this->weekday_map[$day]));
+
+                    if (isset($this->weekday_map[$day])) {
+                        // @TODO: libkolabxml does not support BYSETPOS, neither we.
+                        // However, we can convert most common cases to BYDAY
+                        if (!$occurrence && $freq == 'MONTHLY' && !empty($bysetpos)) {
+                            foreach ($bysetpos as $pos) {
+                                $byday->push(new DayPos(intval($pos), $this->weekday_map[$day]));
+                            }
+                        }
+                        else {
+                            $byday->push(new DayPos($occurrence, $this->weekday_map[$day]));
+                        }
+                    }
                 }
                 $rr->setByday($byday);
             }
@@ -454,13 +480,13 @@ abstract class kolab_format_xcal extends kolab_format
             if ($object['recurrence']['COUNT'])
                 $rr->setCount(intval($object['recurrence']['COUNT']));
             else if ($object['recurrence']['UNTIL'])
-                $rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));
+                $rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true, $start_tz));
 
             if ($rr->isValid()) {
                 // add exception dates (only if recurrence rule is valid)
                 $exdates = new vectordatetime;
                 foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
-                    $exdates->push(self::get_datetime($exdate, null, true));
+                    $exdates->push(self::get_datetime($exdate, null, true, $start_tz));
                 $this->obj->setExceptionDates($exdates);
             }
             else {
@@ -478,18 +504,26 @@ abstract class kolab_format_xcal extends kolab_format
         if (!empty($object['recurrence']['RDATE'])) {
             $rdates = new vectordatetime;
             foreach ((array)$object['recurrence']['RDATE'] as $rdate)
-                $rdates->push(self::get_datetime($rdate, null, true));
+                $rdates->push(self::get_datetime($rdate, null, true, $start_tz));
             $this->obj->setRecurrenceDates($rdates);
         }
 
-        // save alarm
+        // save alarm(s)
         $valarms = new vectoralarm;
+        $valarm_hashes = array();
         if ($object['valarms']) {
             foreach ($object['valarms'] as $valarm) {
                 if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
                     continue;  // skip unknown alarm types
                 }
 
+                // Get rid of duplicates, some CalDAV clients can set them
+                $hash = serialize($valarm);
+                if (in_array($hash, $valarm_hashes)) {
+                    continue;
+                }
+                $valarm_hashes[] = $hash;
+
                 if ($valarm['action'] == 'EMAIL') {
                     $recipients = new vectorcontactref;
                     foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
@@ -514,7 +548,15 @@ abstract class kolab_format_xcal extends kolab_format
                 if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
                     $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
                 }
+                else if (preg_match('/^@([0-9]+)$/', $valarm['trigger'], $m)) {
+                    $alarm->setStart(self::get_datetime($m[1], new DateTimeZone('UTC')));
+                }
                 else {
+                    // Support also interval in format without PT, e.g. -10M
+                    if (preg_match('/^([-+]*)([0-9]+[DHMS])$/', strtoupper($valarm['trigger']), $m)) {
+                        $valarm['trigger'] = $m[1] . ($m[2][strlen($m[2])-1] == 'D' ? 'P' : 'PT') . $m[2];
+                    }
+
                     try {
                         $period   = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
                         $duration = new Duration($period->d, $period->h, $period->i, $period->s, $valarm['trigger'][0] == '-');
@@ -711,4 +753,27 @@ abstract class kolab_format_xcal extends kolab_format
 
         return $reschedule;
     }
-}
\ No newline at end of file
+
+    /**
+     * Clones into an instance of libcalendaring's extended EventCal class
+     *
+     * @return mixed EventCal object or false on failure
+     */
+    public function to_libcal()
+    {
+        static $error_logged = false;
+
+        if (class_exists('kolabcalendaring')) {
+            return new EventCal($this->obj);
+        }
+        else if (!$error_logged) {
+            $error_logged = true;
+            rcube::raise_error(array(
+                'code'    => 900,
+                'message' => "Required kolabcalendaring module not found"
+            ), true);
+        }
+
+        return false;
+    }
+}
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index db7e0ba3..ceacaa75 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -86,11 +86,7 @@ class kolab_storage
             (self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2'));
 
         if (self::$ready) {
-            // set imap options
-            self::$imap->set_options(array(
-                'skip_deleted' => true,
-                'threading' => false,
-            ));
+            // do nothing
         }
         else if (!class_exists('kolabformat')) {
             rcube::raise_error(array(
@@ -221,7 +217,7 @@ class kolab_storage
             else
                 $folder->set_folder($foldername, $type, $folderdata[$foldername]);
 
-            if ($object = $folder->get_object($uid, '*'))
+            if ($object = $folder->get_object($uid))
                 return $object;
         }
 
@@ -232,7 +228,7 @@ class kolab_storage
      * Execute cross-folder searches with the given query.
      *
      * @param array  Pseudo-SQL query as list of filter parameter triplets
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
+     * @param string Folder type (contact,event,task,journal,file,note,configuration)
      * @param int    Expected number of records or limit (for performance reasons)
      *
      * @return array List of Kolab data objects (each represented as hash array)
@@ -251,7 +247,7 @@ class kolab_storage
                 $folder->set_order_and_limit(null, $limit);
             }
 
-            foreach ($folder->select($query, '*') as $object) {
+            foreach ($folder->select($query) as $object) {
                 $result[] = $object;
             }
         }
@@ -348,6 +344,8 @@ class kolab_storage
      */
     public static function namespace_root($name)
     {
+        self::setup();
+
         foreach ((array)self::$imap->get_namespace($name) as $paths) {
             if (strlen($paths[0]) > 1) {
                 return $paths[0];
@@ -528,16 +526,17 @@ class kolab_storage
             ) {
                 self::$last_error = 'No permission to create folder';
                 return false;
-          }
+            }
         }
 
         // update the folder name
         if (strlen($oldfolder)) {
             if ($oldfolder != $folder) {
                 $result = self::folder_rename($oldfolder, $folder);
-          }
-          else
-              $result = true;
+            }
+            else {
+                $result = true;
+            }
         }
         // create new folder
         else {
@@ -577,10 +576,22 @@ class kolab_storage
      */
     public static function custom_displayname($folder)
     {
+        static $_metadata;
+
         // find custom display name in folder METADATA
         if (self::$config->get('kolab_custom_display_names', true) && self::setup()) {
-            // For performance reasons ask for all folders, it will be cached as one cache entry
-            $metadata = self::$imap->get_metadata("*", array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
+            if ($_metadata !== null) {
+                $metadata = $_metadata;
+            }
+            else {
+                // For performance reasons ask for all folders, it will be cached as one cache entry
+                $metadata = self::$imap->get_metadata("*", array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
+
+                // If cache is disabled store result in memory
+                if (!self::$config->get('imap_cache')) {
+                    $_metadata = $metadata;
+                }
+            }
 
             if ($data = $metadata[$folder]) {
                 if (($name = $data[self::NAME_KEY_PRIVATE]) || ($name = $data[self::NAME_KEY_SHARED])) {
@@ -825,11 +836,7 @@ class kolab_storage
         if (!$filter) {
             // Get ALL folders list, standard way
             if ($subscribed) {
-                $folders = self::$imap->list_folders_subscribed($root, $mbox);
-                // add temporarily subscribed folders
-                if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                    $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-                }
+                $folders = self::_imap_list_subscribed($root, $mbox);
             }
             else {
                 $folders = self::_imap_list_folders($root, $mbox);
@@ -841,13 +848,7 @@ class kolab_storage
         $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
 
         // get folders types for all folders
-        if (!$subscribed || $prefix == '*' || !self::$config->get('kolab_skip_namespace')) {
-            $folderdata = self::folders_typedata($prefix);
-        }
-        else {
-            // fetch folder types for the effective list of (subscribed) folders when post-filtering
-            $folderdata = array();
-        }
+        $folderdata = self::folders_typedata($prefix);
 
         if (!is_array($folderdata)) {
             return array();
@@ -866,12 +867,7 @@ class kolab_storage
 
         // Get folders list
         if ($subscribed) {
-            $folders = self::$imap->list_folders_subscribed($root, $mbox);
-
-            // add temporarily subscribed folders
-            if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-            }
+            $folders = self::_imap_list_subscribed($root, $mbox);
         }
         else {
             $folders = self::_imap_list_folders($root, $mbox);
@@ -884,11 +880,6 @@ class kolab_storage
 
         // Filter folders list
         foreach ($folders as $idx => $folder) {
-            // lookup folder type
-            if (!array_key_exists($folder, $folderdata)) {
-                $folderdata[$folder] = self::folder_type($folder);
-            }
-
             $type = $folderdata[$folder];
 
             if ($filter == 'mail' && empty($type)) {
@@ -934,6 +925,21 @@ class kolab_storage
         return $folders;
     }
 
+    /**
+     * Wrapper for rcube_imap::list_folders_subscribed()
+     * with support for temporarily subscribed folders
+     */
+    protected static function _imap_list_subscribed($root, $mbox)
+    {
+        $folders = self::$imap->list_folders_subscribed($root, $mbox);
+
+        // add temporarily subscribed folders
+        if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
+            $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
+        }
+
+        return $folders;
+    }
 
     /**
      * Search for shared or otherwise not listed groupware folders the user has access
@@ -1009,6 +1015,10 @@ class kolab_storage
      */
     public static function folder_hierarchy($folders, &$tree = null)
     {
+        if (!self::setup()) {
+            return array();
+        }
+
         $_folders = array();
         $delim    = self::$imap->get_hierarchy_delimiter();
         $other_ns = rtrim(self::namespace_root('other'), $delim);
@@ -1538,12 +1548,12 @@ class kolab_storage
      *
      * @param array   User entry from LDAP
      * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Return subscribed folders only (null to use configured subscription mode)
+     * @param int     1 - subscribed folders only, 0 - all folders, 2 - all non-active
      * @param array   Will be filled with folder-types data
      *
      * @return array List of folders
      */
-    public static function list_user_folders($user, $type, $subscribed = null, &$folderdata = array())
+    public static function list_user_folders($user, $type, $subscribed = 0, &$folderdata = array())
     {
         self::setup();
 
@@ -1554,9 +1564,19 @@ class kolab_storage
         if (!empty($user[$user_attrib])) {
             list($mbox) = explode('@', $user[$user_attrib]);
 
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $other_ns = self::namespace_root('other');
-            $folders = self::list_folders($other_ns . $mbox . $delimiter, '*', $type, $subscribed, $folderdata);
+            $delimiter  = self::$imap->get_hierarchy_delimiter();
+            $other_ns   = self::namespace_root('other');
+            $prefix     = $other_ns . $mbox . $delimiter;
+            $subscribed = (int) $subscribed;
+            $subs       = $subscribed < 2 ? (bool) $subscribed : false;
+            $folders    = self::list_folders($prefix, '*', $type, $subs, $folderdata);
+
+            if ($subscribed === 2 && !empty($folders)) {
+                $active = self::get_states();
+                if (!empty($active)) {
+                    $folders = array_diff($folders, $active);
+                }
+            }
         }
 
         return $folders;
diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index 41984702..362d53c1 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -186,7 +186,9 @@ class kolab_storage_cache
 
         if (!$this->ready) {
             // kolab cache is disabled, synchronize IMAP mailbox cache only
+            $this->imap_mode(true);
             $this->imap->folder_sync($this->folder->name);
+            $this->imap_mode(false);
         }
         else {
             // read cached folder metadata
@@ -204,7 +206,7 @@ class kolab_storage_cache
                 $this->_sync_lock();
 
                 // disable messages cache if configured to do so
-                $this->bypass(true);
+                $this->imap_mode(true);
 
                 // synchronize IMAP mailbox cache
                 $this->imap->folder_sync($this->folder->name);
@@ -212,25 +214,50 @@ class kolab_storage_cache
                 // compare IMAP index with object cache index
                 $imap_index = $this->imap->index($this->folder->name, null, null, true, true);
 
+                $this->imap_mode(false);
+
                 // determine objects to fetch or to invalidate
                 if (!$imap_index->is_error()) {
                     $imap_index = $imap_index->get();
+                    $old_index  = array();
+                    $del_index  = array();
 
                     // read cache index
                     $sql_result = $this->db->query(
-                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?",
-                        $this->folder_id
+                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?"
+                            . " ORDER BY `msguid` DESC", $this->folder_id
                     );
 
-                    $old_index = array();
                     while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                        $old_index[] = $sql_arr['msguid'];
+                        // Mark all duplicates for removal (note sorting order above)
+                        // Duplicates here should not happen, but they do sometimes
+                        if (isset($old_index[$sql_arr['uid']])) {
+                            $del_index[] = $sql_arr['msguid'];
+                        }
+                        else {
+                            $old_index[$sql_arr['uid']] = $sql_arr['msguid'];
+                        }
                     }
 
                     // fetch new objects from imap
                     $i = 0;
                     foreach (array_diff($imap_index, $old_index) as $msguid) {
                         if ($object = $this->folder->read_object($msguid, '*')) {
+                            // Deduplication: remove older objects with the same UID
+                            // Here we do not resolve conflicts, we just make sure
+                            // the most recent version of the object will be used
+                            if ($old_msguid = $old_index[$object['uid']]) {
+                                if ($old_msguid < $msguid) {
+                                    $del_index[] = $old_msguid;
+                                }
+                                else {
+                                    $del_index[] = $msguid;
+                                    continue;
+                                }
+                            }
+
+                            $old_index[$object['uid']] = $msguid;
+
                             $this->_extended_insert($msguid, $object);
 
                             // check time limit and abort sync if running too long
@@ -242,8 +269,18 @@ class kolab_storage_cache
                     }
                     $this->_extended_insert(0, null);
 
-                    // delete invalid entries from local DB
-                    $del_index = array_diff($old_index, $imap_index);
+                    $del_index = array_unique($del_index);
+
+                    // delete duplicate entries from IMAP
+                    $rem_index = array_intersect($del_index, $imap_index);
+                    if (!empty($rem_index)) {
+                        $this->imap_mode(true);
+                        $this->imap->delete_message($rem_index, $this->folder->name);
+                        $this->imap_mode(false);
+                    }
+
+                    // delete old/invalid entries from the cache
+                    $del_index += array_diff($old_index, $imap_index);
                     if (!empty($del_index)) {
                         $quoted_ids = join(',', array_map(array($this->db, 'quote'), $del_index));
                         $this->db->query(
@@ -261,8 +298,6 @@ class kolab_storage_cache
                     }
                 }
 
-                $this->bypass(false);
-
                 // remove lock
                 $this->_sync_unlock();
             }
@@ -323,6 +358,33 @@ class kolab_storage_cache
         return $this->objects[$msguid];
     }
 
+    /**
+     * Getter for a single Kolab object identified by its UID
+     *
+     * @param string $uid Object UID
+     *
+     * @return array The Kolab object represented as hash array
+     */
+    public function get_by_uid($uid)
+    {
+        $old_order_by = $this->order_by;
+        $old_limit    = $this->limit;
+
+        // set order to make sure we get most recent object version
+        // set limit to skip count query
+        $this->order_by = '`msguid` DESC';
+        $this->limit    = array(1, 0);
+
+        $list = $this->select(array(array('uid', '=', $uid)));
+
+        // set the order/limit back to defined value
+        $this->order_by = $old_order_by;
+        $this->limit    = $old_limit;
+
+        if (!empty($list) && !empty($list[0])) {
+            return $list[0];
+        }
+    }
 
     /**
      * Insert/Update a cache entry
@@ -576,6 +638,8 @@ class kolab_storage_cache
         else {
             $filter = $this->_query2assoc($query);
 
+            $this->imap_mode(true);
+
             if ($filter['type']) {
                 $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
                 $index  = $this->imap->search_once($this->folder->name, $search);
@@ -584,6 +648,8 @@ class kolab_storage_cache
                 $index = $this->imap->index($this->folder->name, null, null, true, true);
             }
 
+            $this->imap_mode(false);
+
             if ($index->is_error()) {
                 $this->check_error();
                 if ($uids) {
@@ -643,6 +709,8 @@ class kolab_storage_cache
         else {
             $filter = $this->_query2assoc($query);
 
+            $this->imap_mode(true);
+
             if ($filter['type']) {
                 $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
                 $index  = $this->imap->search_once($this->folder->name, $search);
@@ -651,6 +719,8 @@ class kolab_storage_cache
                 $index = $this->imap->index($this->folder->name, null, null, true, true);
             }
 
+            $this->imap_mode(false);
+
             if ($index->is_error()) {
                 $this->check_error();
                 return null;
@@ -717,6 +787,11 @@ class kolab_storage_cache
                 $param[1] = $not . 'LIKE';
                 $qvalue = $this->db->quote('%'.preg_replace('/(^\^|\$$)/', ' ', $param[2]).'%');
             }
+            else if ($param[1] == '~*' || $param[1] == '!~*') {
+                $not = $param[1][1] == '!' ? 'NOT ' : '';
+                $param[1] = $not . 'LIKE';
+                $qvalue = $this->db->quote(preg_replace('/(^\^|\$$)/', ' ', $param[2]).'%');
+            }
             else if ($param[0] == 'tags') {
                 $param[1] = ($param[1] == '!=' ? 'NOT ' : '' ) . 'LIKE';
                 $qvalue = $this->db->quote('% '.$param[2].' %');
@@ -856,6 +931,12 @@ class kolab_storage_cache
         $object['_size']      = strlen($sql_arr['xml']);
         $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
 
+        // Fix old broken objects with missing creation date
+        if (empty($object['created']) && method_exists($object['_formatobj'], 'to_array')) {
+            $new_object        = $object['_formatobj']->to_array();
+            $object['created'] = $new_object['created'];
+        }
+
         return $object;
     }
 
@@ -1109,13 +1190,31 @@ class kolab_storage_cache
     }
 
     /**
-     * Bypass Roundcube messages cache.
-     * Roundcube cache duplicates information already stored in kolab_cache.
+     * Set Roundcube storage options and bypass messages cache.
      *
-     * @param bool $disable True disables, False enables messages cache
+     * We use skip_deleted and threading settings specific to Kolab,
+     * we have to change these global settings only temporarily.
+     * Roundcube cache duplicates information already stored in kolab_cache,
+     * that's why we can disable it for better performance.
+     *
+     * @param bool $force True to start Kolab mode, False to stop it.
      */
-    public function bypass($disable = false)
+    public function imap_mode($force = false)
     {
+        // remember current IMAP settings
+        if ($force) {
+            $this->imap_options = array(
+                'skip_deleted' => $this->imap->get_option('skip_deleted'),
+                'threading'    => $this->imap->get_threading(),
+            );
+        }
+
+        // re-set IMAP settings
+        $this->imap->set_threading($force ? false : $this->imap_options['threading']);
+        $this->imap->set_options(array(
+                'skip_deleted' => $force ? true : $this->imap_options['skip_deleted'],
+        ));
+
         // if kolab cache is disabled do nothing
         if (!$this->enabled) {
             return;
@@ -1131,7 +1230,7 @@ class kolab_storage_cache
 
         if ($messages_cache) {
             // handle recurrent (multilevel) bypass() calls
-            if ($disable) {
+            if ($force) {
                 $this->cache_bypassed += 1;
                 if ($this->cache_bypassed > 1) {
                     return;
@@ -1147,7 +1246,7 @@ class kolab_storage_cache
             switch ($cache_bypass) {
                 case 2:
                     // Disable messages cache completely
-                    $this->imap->set_messages_caching(!$disable);
+                    $this->imap->set_messages_caching(!$force);
                     break;
 
                 case 1:
@@ -1155,7 +1254,7 @@ class kolab_storage_cache
                     // Default mode is both (MODE_INDEX | MODE_MESSAGE)
                     $mode = rcube_imap_cache::MODE_INDEX;
 
-                    if (!$disable) {
+                    if (!$force) {
                         $mode |= rcube_imap_cache::MODE_MESSAGE;
                     }
 
diff --git a/plugins/libkolab/lib/kolab_storage_cache_event.php b/plugins/libkolab/lib/kolab_storage_cache_event.php
index ae9c693b..b6d8b15f 100644
--- a/plugins/libkolab/lib/kolab_storage_cache_event.php
+++ b/plugins/libkolab/lib/kolab_storage_cache_event.php
@@ -40,7 +40,7 @@ class kolab_storage_cache_event extends kolab_storage_cache
         // extend date range for recurring events
         if ($object['recurrence'] && $object['_formatobj']) {
             $recurrence = new kolab_date_recurrence($object['_formatobj']);
-            $dtend = $recurrence->end() ?: new DateTime('now +10 years');
+            $dtend = $recurrence->end() ?: new DateTime('now +100 years');
             $sql_data['dtend'] = $this->_convert_datetime($dtend);
         }
 
diff --git a/plugins/libkolab/lib/kolab_storage_config.php b/plugins/libkolab/lib/kolab_storage_config.php
index 771b9ff1..fb442ece 100644
--- a/plugins/libkolab/lib/kolab_storage_config.php
+++ b/plugins/libkolab/lib/kolab_storage_config.php
@@ -189,7 +189,7 @@ class kolab_storage_config
         $status = $folder->save($object, self::FOLDER_TYPE . '.' . $object['type'], $object['uid']);
 
         // on success, update cached tags list
-        if ($status && is_array($this->tags)) {
+        if ($status && $object['category'] == 'tag' && is_array($this->tags)) {
             $found = false;
             unset($object['_formatobj']); // we don't need it anymore
 
@@ -713,13 +713,11 @@ class kolab_storage_config
             }
 
             if ($update) {
-                if ($this->save($relation, 'relation')) {
-                    $this->tags[$idx] = $relation; // update in-memory cache
-                }
+                $this->save($relation, 'relation');
             }
 
             if ($selected) {
-                $tags = array_diff($tags, (array)$relation['name']);
+                $tags = array_diff($tags, array($relation['name']));
             }
         }
 
@@ -732,9 +730,7 @@ class kolab_storage_config
                     'category' => 'tag',
                 );
 
-                if ($this->save($relation, 'relation')) {
-                    $this->tags[] = $relation; // update in-memory cache
-                }
+                $this->save($relation, 'relation');
             }
         }
     }
diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 00d02efc..4018b7df 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -37,7 +37,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
     public $valid = false;
 
     protected $error = 0;
-
     protected $resource_uri;
 
 
@@ -50,11 +49,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
     function __construct($name, $type = null, $type_annotation = null)
     {
         parent::__construct($name);
-        $this->imap->set_options(array('skip_deleted' => true));
         $this->set_folder($name, $type, $type_annotation);
     }
 
-
     /**
      * Set the IMAP folder this instance connects to
      *
@@ -249,8 +246,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
     /**
      * Get number of objects stored in this folder
      *
-     * @param mixed  Pseudo-SQL query as list of filter parameter triplets
+     * @param mixed Pseudo-SQL query as list of filter parameter triplets
      *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     *
      * @return integer The number of objects of the given type
      * @see self::select()
      */
@@ -266,34 +264,26 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return $this->cache->count($this->_prepare_query($query));
     }
 
-
     /**
-     * List all Kolab objects of the given type
+     * List Kolab objects matching the given query
      *
-     * @param string  $type Object type (e.g. contact, event, todo, journal, note, configuration)
-     * @return array  List of Kolab data objects (each represented as hash array)
+     * @param mixed Pseudo-SQL query as list of filter parameter triplets
+     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     *
+     * @return array List of Kolab data objects (each represented as hash array)
+     * @deprecated Use select()
      */
-    public function get_objects($type = null)
+    public function get_objects($query = array())
     {
-        if (!$type) $type = $this->type;
-
-        if (!$this->valid) {
-            return array();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($type));
+        return $this->select($query);
     }
 
-
     /**
-     * Select *some* Kolab objects matching the given query
+     * Select Kolab objects matching the given query
+     *
+     * @param mixed Pseudo-SQL query as list of filter parameter triplets
+     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
      *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
      * @return array List of Kolab data objects (each represented as hash array)
      */
     public function select($query = array())
@@ -302,11 +292,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
             return array();
         }
 
-        // check query argument
-        if (empty($query)) {
-            return $this->get_objects();
-        }
-
         // synchronize caches
         $this->cache->synchronize();
 
@@ -314,7 +299,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return $this->cache->select($this->_prepare_query($query));
     }
 
-
     /**
      * Getter for object UIDs only
      *
@@ -348,12 +332,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         if ($length !== null) {
             $this->cache->set_limit($length, $offset);
         }
-
-        $this->order_and_limit = array(
-            'cols'   => $sortcols,
-            'limit'  => $length,
-            'offset' => $offset,
-        );
     }
 
     /**
@@ -383,51 +361,24 @@ class kolab_storage_folder extends kolab_storage_folder_api
     }
 
     /**
-     * Getter for a single Kolab object, identified by its UID
+     * Getter for a single Kolab object identified by its UID
      *
-     * @param string $uid  Object UID
-     * @param string $type Object type (e.g. contact, event, todo, journal, note, configuration)
-     *                     Defaults to folder type
+     * @param string $uid Object UID
      *
      * @return array The Kolab object represented as hash array
      */
-    public function get_object($uid, $type = null)
+    public function get_object($uid)
     {
         if (!$this->valid || !$uid) {
             return false;
         }
 
-        $query = array(array('uid', '=', $uid));
-
-        if ($type) {
-            $query[] = array('type', '=', $type);
-        }
-
         // synchronize caches
         $this->cache->synchronize();
 
-        // we don't use cache->get() here because we don't have msguid
-        // yet, using select() is faster
-
-        // set order to make sure we get most recent object version
-        // set limit to skip count query
-        $this->cache->set_order_by('msguid DESC');
-        $this->cache->set_limit(1);
-
-        $list = $this->cache->select($this->_prepare_query($query));
-
-        // set the order/limit back to defined value
-        $this->cache->set_order_by($this->order_and_limit['order']);
-        $this->cache->set_limit($this->order_and_limit['limit'], $this->order_and_limit['offset']);
-
-        if (!empty($list) && !empty($list[0])) {
-            return $list[0];
-        }
-
-        return false;
+        return $this->cache->get_by_uid($uid);
     }
 
-
     /**
      * Fetch a Kolab object attachment which is stored in a separate part
      * of the mail MIME message that represents the Kolab record.
@@ -475,7 +426,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return null;
     }
 
-
     /**
      * Fetch the mime message from the storage server and extract
      * the Kolab groupware object from it
@@ -497,9 +447,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
 
         $this->imap->set_folder($folder);
 
-        $this->cache->bypass(true);
+        $this->cache->imap_mode(true);
         $message = new rcube_message($msguid);
-        $this->cache->bypass(false);
+        $this->cache->imap_mode(false);
 
         // Message doesn't exist?
         if (empty($message->headers)) {
@@ -747,9 +697,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
 
                 if ($old_uid) {
                     // delete old message
-                    $this->cache->bypass(true);
+                    $this->cache->imap_mode(true);
                     $this->imap->delete_message($old_uid, $object['_mailbox']);
-                    $this->cache->bypass(false);
+                    $this->cache->imap_mode(false);
                 }
 
                 // insert/update message in cache
@@ -845,7 +795,7 @@ class kolab_storage_folder extends kolab_storage_folder_api
         $msguid = is_array($object) ? $object['_msguid'] : $this->cache->uid2msguid($object);
         $success = false;
 
-        $this->cache->bypass(true);
+        $this->cache->imap_mode(true);
 
         if ($msguid && $expunge) {
             $success = $this->imap->delete_message($msguid, $this->name);
@@ -854,7 +804,7 @@ class kolab_storage_folder extends kolab_storage_folder_api
             $success = $this->imap->set_flag($msguid, 'DELETED', $this->name);
         }
 
-        $this->cache->bypass(false);
+        $this->cache->imap_mode(false);
 
         if ($success) {
             $this->cache->set($msguid, false);
@@ -863,7 +813,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return $success;
     }
 
-
     /**
      *
      */
@@ -874,14 +823,13 @@ class kolab_storage_folder extends kolab_storage_folder_api
         }
 
         $this->cache->purge();
-        $this->cache->bypass(true);
+        $this->cache->imap_mode(true);
         $result = $this->imap->clear_folder($this->name);
-        $this->cache->bypass(false);
+        $this->cache->imap_mode(false);
 
         return $result;
     }
 
-
     /**
      * Restore a previously deleted object
      *
@@ -895,9 +843,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
         }
 
         if ($msguid = $this->cache->uid2msguid($uid, true)) {
-            $this->cache->bypass(true);
+            $this->cache->imap_mode(true);
             $result = $this->imap->set_flag($msguid, 'UNDELETED', $this->name);
-            $this->cache->bypass(false);
+            $this->cache->imap_mode(false);
 
             if ($result) {
                 return $msguid;
@@ -907,7 +855,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return false;
     }
 
-
     /**
      * Move a Kolab object message to another IMAP folder
      *
@@ -925,9 +872,9 @@ class kolab_storage_folder extends kolab_storage_folder_api
             $target_folder = kolab_storage::get_folder($target_folder);
 
         if ($msguid = $this->cache->uid2msguid($uid)) {
-            $this->cache->bypass(true);
+            $this->cache->imap_mode(true);
             $result = $this->imap->move_message($msguid, $target_folder->name, $this->name);
-            $this->cache->bypass(false);
+            $this->cache->imap_mode(false);
 
             if ($result) {
                 $new_uid = ($copyuid = $this->imap->conn->data['COPYUID']) ? $copyuid[1] : null;
@@ -946,7 +893,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return false;
     }
 
-
     /**
      * Creates source of the configuration object message
      *
@@ -1127,7 +1073,6 @@ class kolab_storage_folder extends kolab_storage_folder_api
         return $message;
     }
 
-
     /**
      * Triggers any required updates after changes within the
      * folder. This is currently only required for handling free/busy
diff --git a/plugins/libkolab/lib/kolab_storage_folder_api.php b/plugins/libkolab/lib/kolab_storage_folder_api.php
index fd5b53e0..1879d6b9 100644
--- a/plugins/libkolab/lib/kolab_storage_folder_api.php
+++ b/plugins/libkolab/lib/kolab_storage_folder_api.php
@@ -157,7 +157,8 @@ abstract class kolab_storage_folder_api
      */
     public function get_foldername()
     {
-        $parts = explode('/', $this->name);
+        $parts = explode($this->imap->get_hierarchy_delimiter(), $this->name);
+
         return rcube_charset::convert(end($parts), 'UTF7-IMAP');
     }
 
@@ -168,7 +169,9 @@ abstract class kolab_storage_folder_api
      */
     public function get_parent()
     {
-        $path = explode('/', $this->name);
+        $delim = $this->imap->get_hierarchy_delimiter();
+        $path  = explode($delim, $this->name);
+
         array_pop($path);
 
         // don't list top-level namespace folder
@@ -176,7 +179,7 @@ abstract class kolab_storage_folder_api
             $path = array();
         }
 
-        return join('/', $path);
+        return join($delim, $path);
     }
 
     /**
diff --git a/plugins/libkolab/lib/kolab_storage_folder_user.php b/plugins/libkolab/lib/kolab_storage_folder_user.php
index 7e435002..ec751fdb 100644
--- a/plugins/libkolab/lib/kolab_storage_folder_user.php
+++ b/plugins/libkolab/lib/kolab_storage_folder_user.php
@@ -80,7 +80,7 @@ class kolab_storage_folder_user extends kolab_storage_folder_virtual
      *
      * @return string  The owner of this folder.
      */
-    public function get_owner()
+    public function get_owner($fully_qualified = false)
     {
         return $this->ldaprec['mail'];
     }
diff --git a/plugins/libkolab/lib/kolab_utils.php b/plugins/libkolab/lib/kolab_utils.php
new file mode 100644
index 00000000..c61ec49e
--- /dev/null
+++ b/plugins/libkolab/lib/kolab_utils.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Utility class providing unified functionality for other plugins.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_utils
+{
+    public static function folder_form($form, $folder, $domain, $hidden_fields = array())
+    {
+        $rcmail = rcmail::get_instance();
+
+        // add folder ACL tab
+        if (is_string($folder) && strlen($folder)) {
+            $form['sharing'] = array(
+                'name'    => rcube::Q($rcmail->gettext('libkolab.tabsharing')),
+                'content' => self::folder_acl_form($folder),
+            );
+        }
+
+        $form_html = '';
+
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $field) {
+                $hiddenfield = new html_hiddenfield($field);
+                $form_html .= $hiddenfield->show() . "\n";
+            }
+        }
+
+        // create form output
+        foreach ($form as $tab) {
+            if (is_array($tab['fields']) && empty($tab['content'])) {
+                $table = new html_table(array('cols' => 2, 'class' => 'propform'));
+                foreach ($tab['fields'] as $col => $colprop) {
+                    $label = !empty($colprop['label']) ? $colprop['label'] : $rcmail->gettext("$domain.$col");
+
+                    $table->add('title', html::label($colprop['id'], rcube::Q($label)));
+                    $table->add(null, $colprop['value']);
+                }
+                $content = $table->show();
+            }
+            else {
+                $content = $tab['content'];
+            }
+
+            if (!empty($content)) {
+                $form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) . "\n";
+            }
+        }
+
+        return $form_html;
+    }
+
+    /**
+     * Handler for ACL form template object
+     */
+    public static function folder_acl_form($folder)
+    {
+        $rcmail  = rcmail::get_instance();
+        $storage = $rcmail->get_storage();
+        $options = $storage->folder_info($folder);
+
+        $rcmail->plugins->load_plugin('acl', true);
+
+        // get sharing UI from acl plugin
+        $acl = $rcmail->plugins->exec_hook('folder_form', array(
+                'form'    => array(),
+                'options' => $options,
+                'name'    => $folder
+        ));
+
+        return $acl['form']['sharing']['content'] ?: html::div('hint', $rcmail->gettext('libkolab.aclnorights'));
+    }
+}
diff --git a/plugins/libkolab/js/folderlist.js b/plugins/libkolab/libkolab.js
similarity index 51%
rename from plugins/libkolab/js/folderlist.js
rename to plugins/libkolab/libkolab.js
index 64f8a35c..1b669846 100644
--- a/plugins/libkolab/js/folderlist.js
+++ b/plugins/libkolab/libkolab.js
@@ -1,12 +1,12 @@
 /**
- * Kolab groupware folders treelist widget
+ * Kolab groupware utilities
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2015-2018, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -25,6 +25,269 @@
  * for the JavaScript code in this file.
  */
 
+var libkolab_audittrail = {}, libkolab = {};
+
+libkolab_audittrail.quote_html = function(str)
+{
+    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+};
+
+// show object changelog in a dialog
+libkolab_audittrail.object_history_dialog = function(p)
+{
+    // render dialog
+    var $dialog = $(p.container);
+
+    // close show dialog first
+    if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
+
+    // hide and reset changelog table
+    $dialog.find('div.notfound-message').remove();
+    $dialog.find('.changelog-table').show().children('tbody')
+        .html('<tr><td colspan="4"><span class="loading">' + rcmail.gettext('loading') + '</span></td></tr>');
+
+    // open jquery UI dialog
+    $dialog.dialog({
+        modal: true,
+        resizable: true,
+        closeOnEscape: true,
+        title: p.title,
+        open: function() {
+            $dialog.attr('aria-hidden', 'false');
+        },
+        close: function() {
+            $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
+        },
+        buttons: [
+            {
+                text: rcmail.gettext('close'),
+                click: function() { $dialog.dialog('close'); },
+                'class': 'cancel',
+                autofocus: true
+            }
+        ],
+        minWidth: 450,
+        width: 650,
+        height: 350,
+        minHeight: 200
+    })
+    .show().children('.compare-button').hide();
+
+    // initialize event handlers for history dialog UI elements
+    if (!$dialog.data('initialized')) {
+      // compare button
+      $dialog.find('.compare-button input').click(function(e) {
+        var rev1 = $dialog.find('.changelog-table input.diff-rev1:checked').val(),
+          rev2 = $dialog.find('.changelog-table input.diff-rev2:checked').val();
+
+          if (rev1 && rev2 && rev1 != rev2) {
+            // swap revisions if the user got it wrong
+            if (rev1 > rev2) {
+              var tmp = rev2;
+              rev2 = rev1;
+              rev1 = tmp;
+            }
+
+            if (p.comparefunc) {
+                p.comparefunc(rev1, rev2);
+            }
+          }
+          else {
+              alert('Invalid selection!')
+          }
+
+          if (!rcube_event.is_keyboard(e) && this.blur) {
+              this.blur();
+          }
+          return false;
+      });
+
+      // delegate handlers for list actions
+      $dialog.find('.changelog-table tbody').on('click', 'td.actions a', function(e) {
+          var link = $(this),
+            action = link.hasClass('restore') ? 'restore' : 'show',
+            event = $('#eventhistory').data('event'),
+            rev = link.attr('data-rev');
+
+            // ignore clicks on first row (current revision)
+            if (link.closest('tr').hasClass('first')) {
+                return false;
+            }
+
+            // let the user confirm the restore action
+            if (action == 'restore' && !confirm(rcmail.gettext('revisionrestoreconfirm', p.module).replace('$rev', rev))) {
+                return false;
+            }
+
+            if (p.listfunc) {
+                p.listfunc(action, rev);
+            }
+
+            if (!rcube_event.is_keyboard(e) && this.blur) {
+                this.blur();
+            }
+            return false;
+      })
+      .on('click', 'input.diff-rev1', function(e) {
+          if (!this.checked) return true;
+
+          var rev1 = this.value, selection_valid = false;
+          $dialog.find('.changelog-table input.diff-rev2').each(function(i, elem) {
+              $(elem).prop('disabled', elem.value <= rev1);
+              if (elem.checked && elem.value > rev1) {
+                  selection_valid = true;
+              }
+          });
+          if (!selection_valid) {
+              $dialog.find('.changelog-table input.diff-rev2:not([disabled])').last().prop('checked', true);
+          }
+      });
+
+      $dialog.addClass('changelog-dialog').data('initialized', true);
+    }
+
+    return $dialog;
+};
+
+// callback from server with changelog data
+libkolab_audittrail.render_changelog = function(data, object, folder)
+{
+    var Q = libkolab_audittrail.quote_html;
+
+    var $dialog = $('.changelog-dialog')
+    if (data === false || !data.length) {
+        return false;
+    }
+
+    var i, change, accessible, op_append,
+      first = data.length - 1, last = 0,
+      is_writeable = !!folder.editable,
+      op_labels = {
+          RECEIVE:   'actionreceive',
+          APPEND:    'actionappend',
+          MOVE:      'actionmove',
+          DELETE:    'actiondelete',
+          READ:      'actionread',
+          FLAGSET:   'actionflagset',
+          FLAGCLEAR: 'actionflagclear'
+      },
+      actions = '<a href="#show" class="iconbutton preview" title="'+ rcmail.gettext('showrevision','libkolab') +'" data-rev="{rev}" /> ' +
+          (is_writeable ? '<a href="#restore" class="iconbutton restore" title="'+ rcmail.gettext('restore','libkolab') + '" data-rev="{rev}" />' : ''),
+      tbody = $dialog.find('.changelog-table tbody').html('');
+
+    for (i=first; i >= 0; i--) {
+        change = data[i];
+        accessible = change.date && change.user;
+
+        if (change.op == 'MOVE' && change.mailbox) {
+            op_append = ' ⇢ ' + change.mailbox;
+        }
+        else if ((change.op == 'FLAGSET' || change.op == 'FLAGCLEAR') && change.flags) {
+            op_append = ': ' + change.flags;
+        }
+        else {
+            op_append = '';
+        }
+
+        $('<tr class="' + (i == first ? 'first' : (i == last ? 'last' : '')) + (accessible ? '' : 'undisclosed') + '">')
+            .append('<td class="diff">' + (accessible && change.op != 'DELETE' ? 
+                '<input type="radio" name="rev1" class="diff-rev1" value="' + change.rev + '" title="" '+ (i == last ? 'checked="checked"' : '') +' /> '+
+                '<input type="radio" name="rev2" class="diff-rev2" value="' + change.rev + '" title="" '+ (i == first ? 'checked="checked"' : '') +' /></td>'
+                : ''))
+            .append('<td class="revision">' + Q(i+1) + '</td>')
+            .append('<td class="date">' + Q(change.date || '') + '</td>')
+            .append('<td class="user">' + Q(change.user || 'undisclosed') + '</td>')
+            .append('<td class="operation" title="' + op_append + '">' + Q(rcmail.gettext(op_labels[change.op] || '', 'libkolab') + op_append) + '</td>')
+            .append('<td class="actions">' + (accessible && change.op != 'DELETE' ? actions.replace(/\{rev\}/g, change.rev) : '') + '</td>')
+            .appendTo(tbody);
+    }
+
+    if (first > 0) {
+        $dialog.find('.compare-button').fadeIn(200);
+        $dialog.find('.changelog-table tr.last input.diff-rev1').click();
+    }
+
+    // set dialog size according to content
+    libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height() + 15, 600);
+
+    return $dialog;
+};
+
+// resize and reposition (center) the dialog window
+libkolab_audittrail.dialog_resize = function(id, height, width)
+{
+    var win = $(window), w = win.width(), h = win.height();
+    $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
+};
+
+/**
+ * Open an attachment either in a browser window for inline view or download it
+ */
+libkolab.load_attachment = function(query, attachment)
+{
+    query._frame = 1;
+
+    // open attachment in frame if it's of a supported mimetype similar as in app.js
+    if (attachment.id && attachment.mimetype && $.inArray(attachment.mimetype, rcmail.env.mimetypes) >= 0) {
+        if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
+            return;
+        }
+    }
+
+    query._frame = null;
+    query._download = 1;
+    rcmail.goto_url('get-attachment', query, false);
+};
+
+/**
+ * Build attachments list element
+ */
+libkolab.list_attachments = function(list, container, edit, data, ondelete, onload)
+{
+    var ul = $('<ul>').addClass('attachmentslist');
+
+    $.each(list || [], function(i, elem) {
+        var li = $('<li>').addClass(elem.classname);
+
+        // name/link
+        $('<a>').attr({href: '#load', 'class': 'filename'})
+            .append($('<span class="attachment-name">').text(elem.name))
+            .click({record: data, attachment: elem}, function(e) {
+                if (onload) {
+                    onload(e.data);
+                }
+                return false;
+            })
+            .appendTo(li);
+
+        if (edit) {
+            rcmail.env.attachments[elem.id] = elem;
+            // delete link
+            $('<a>').attr({href: '#delete', title: rcmail.gettext('delete'), 'class': 'delete'})
+                .click({id: elem.id}, function(e) {
+                    $(this.parentNode).hide();
+                    delete rcmail.env.attachments[e.data.id];
+                    if (ondelete) {
+                        ondelete(e.data.id);
+                    }
+                    return false;
+                })
+                .appendTo(li);
+        }
+
+        ul.append(li);
+    });
+
+    if (edit && rcmail.gui_objects.attachmentlist) {
+        ul.id = rcmail.gui_objects.attachmentlist.id;
+        rcmail.gui_objects.attachmentlist = ul.get(0);
+    }
+
+    container.empty().append(ul);
+};
+
+
 function kolab_folderlist(node, p)
 {
     // extends treelist.js
@@ -46,7 +309,8 @@ function kolab_folderlist(node, p)
         if (results.length) {
           // create treelist widget to present the search results
           if (!search_results_widget) {
-              var list_id = (me.container.attr('id') || p.id_prefix || '0')
+              var list_id = (me.container.attr('id') || p.id_prefix || '0');
+
               search_results_container = $('<div class="searchresults"></div>')
                   .html(p.search_title ? '<h2 class="boxtitle" id="st:' + list_id + '">' + p.search_title + '</h2>' : '')
                   .insertAfter(me.container);
@@ -57,6 +321,7 @@ function kolab_folderlist(node, p)
                   id_decode: p.id_decode,
                   selectable: false
               });
+
               // copy classes from main list
               search_results_widget.container.addClass(me.container.attr('class')).attr('aria-labelledby', 'st:' + list_id);
 
@@ -66,6 +331,7 @@ function kolab_folderlist(node, p)
                   .on('click', 'input[type=checkbox], a.subscribed, span.subscribed', function(e) {
                       var node, has_children, li = $(this).closest('li'),
                           id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
+
                       if (p.id_decode)
                           id = p.id_decode(id);
                       node = search_results_widget.get_node(id);
@@ -109,7 +375,7 @@ function kolab_folderlist(node, p)
 
                       // set focus to cloned checkbox
                       if (rcube_event.is_keyboard(e)) {
-                        $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
+                          $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
                       }
                   })
                   .on('click', function(e) {
@@ -149,6 +415,9 @@ function kolab_folderlist(node, p)
                   item.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
                   item.find('a.subscribed, span.subscribed').hide();
               }
+
+              prop.li = item.parent().get(0);
+              me.triggerEvent('add-item', prop);
           }
 
           search_results_container.show();
@@ -331,23 +600,87 @@ function kolab_folderlist(node, p)
     });
 
     this.container.on('click', 'a.remove', function(e) {
-      var li = $(this).closest('li'),
-          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
+        var li = $(this).closest('li'),
+            id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
 
-      if (me.is_search()) {
-          id = id.replace(/--xsR$/, '');
-          li = $(me.get_item(id, true));
-      }
+        if (me.is_search()) {
+            id = id.replace(/--xsR$/, '');
+            li = $(me.get_item(id, true));
+        }
 
-      if (p.id_decode)
-          id = p.id_decode(id);
+        if (p.id_decode)
+            id = p.id_decode(id);
 
-      me.triggerEvent('remove', { id: id, item: li });
+        me.triggerEvent('remove', { id: id, item: li });
 
-      e.stopPropagation();
-      return false;
+        e.stopPropagation();
+        return false;
     });
 }
 
 // link prototype from base class
-kolab_folderlist.prototype = rcube_treelist_widget.prototype;
+if (window.rcube_treelist_widget) {
+    kolab_folderlist.prototype = rcube_treelist_widget.prototype;
+}
+
+
+window.rcmail && rcmail.addEventListener('init', function(e) {
+    var loading_lock;
+
+    if (rcmail.env.task == 'mail') {
+        rcmail.register_command('kolab-mail-history', function() {
+            var dialog, uid = rcmail.get_single_uid(), rec = { uid: uid, mbox: rcmail.get_message_mailbox(uid) };
+            if (!uid || !window.libkolab_audittrail) {
+                return false;
+            }
+
+            // render dialog
+            $dialog = libkolab_audittrail.object_history_dialog({
+                module: 'libkolab',
+                container: '#mailmessagehistory',
+                title: rcmail.gettext('objectchangelog','libkolab')
+            });
+
+            $dialog.data('rec', rec);
+
+            // fetch changelog data
+            loading_lock = rcmail.set_busy(true, 'loading', loading_lock);
+            rcmail.http_post('plugin.message-changelog', { _uid: rec.uid, _mbox: rec.mbox }, loading_lock);
+
+        }, rcmail.env.action == 'show');
+
+        rcmail.addEventListener('plugin.message_render_changelog', function(data) {
+            var $dialog = $('#mailmessagehistory'),
+                rec = $dialog.data('rec');
+
+            if (data === false || !data.length || !rec) {
+              // display 'unavailable' message
+              $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','libkolab') + '</div>')
+                  .insertBefore($dialog.find('.changelog-table').hide());
+              return;
+            }
+
+            data.module = 'libkolab';
+            libkolab_audittrail.render_changelog(data, rec, {});
+        });
+
+        rcmail.env.message_commands.push('kolab-mail-history');
+    }
+
+    if (rcmail.env.action == 'get-attachment') {
+        if (rcmail.gui_objects.attachmentframe) {
+            rcmail.gui_objects.messagepartframe = rcmail.gui_objects.attachmentframe;
+            rcmail.enable_command('image-scale', 'image-rotate', !!/^image\//.test(rcmail.env.mimetype));
+            rcmail.register_command('print-attachment', function() {
+                var frame = rcmail.get_frame_window(rcmail.gui_objects.attachmentframe.id);
+                if (frame) frame.print();
+            }, true);
+        }
+
+        if (rcmail.env.attachment_download_url) {
+            rcmail.register_command('download-attachment', function() {
+                rcmail.location_href(rcmail.env.attachment_download_url, window);
+            }, true);
+        }
+    }
+});
diff --git a/plugins/libkolab/libkolab.php b/plugins/libkolab/libkolab.php
index 47445198..0d96bf7f 100644
--- a/plugins/libkolab/libkolab.php
+++ b/plugins/libkolab/libkolab.php
@@ -57,13 +57,16 @@ class libkolab extends rcube_plugin
 
         $this->add_texts('localization/', false);
 
+        if ($rcmail->output->type == 'html') {
+            $rcmail->output->add_handler('libkolab.folder_search_form', array($this, 'folder_search_form'));
+            $this->include_stylesheet($this->local_skin_path() . '/libkolab.css');
+        }
+
         // embed scripts and templates for email message audit trail
         if ($rcmail->task == 'mail' && self::get_bonnie_api()) {
             if ($rcmail->output->type == 'html') {
                 $this->add_hook('render_page', array($this, 'bonnie_render_page'));
-
-                $this->include_script('js/audittrail.js');
-                $this->include_stylesheet($this->local_skin_path() . '/libkolab.css');
+                $this->include_script('libkolab.js');
 
                 // add 'Show history' item to message menu
                 $this->api->add_content(html::tag('li', null,
@@ -87,7 +90,7 @@ class libkolab extends rcube_plugin
      */
     function storage_init($p)
     {
-        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION');
+        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION MESSAGE-ID');
         return $p;
     }
 
@@ -277,6 +280,7 @@ class libkolab extends rcube_plugin
             'libkolab.actionflagset',
             'libkolab.actionflagclear',
             'libkolab.objectchangelog',
+            'libkolab.objectchangelognotavailable',
             'close'
         );
 
@@ -339,4 +343,33 @@ class libkolab extends rcube_plugin
     {
         return $event['allday'] ? 'Ymd' : 'Ymd\THis';
     }
+
+    /**
+     * Returns HTML code for folder search widget
+     *
+     * @param array $attrib Named parameters
+     *
+     * @return string HTML code for the gui object
+     */
+    public function folder_search_form($attrib)
+    {
+        $rcmail = rcube::get_instance();
+        $attrib += array(
+            'gui-object'    => false,
+            'wrapper'       => true,
+            'form-name'     => 'foldersearchform',
+            'command'       => 'non-extsing-command',
+            'reset-command' => 'non-existing-command',
+        );
+
+        if ($attrib['label-domain'] && !strpos($attrib['buttontitle'], '.')) {
+            $attrib['buttontitle'] = $attrib['label-domain'] . '.' . $attrib['buttontitle'];
+        }
+
+        if ($attrib['buttontitle']) {
+            $attrib['placeholder'] = $rcmail->gettext($attrib['buttontitle']);
+        }
+
+        return $rcmail->output->search_form($attrib);
+    }
 }
diff --git a/plugins/libkolab/localization/bg_BG.inc b/plugins/libkolab/localization/bg_BG.inc
new file mode 100644
index 00000000..d02fccd7
--- /dev/null
+++ b/plugins/libkolab/localization/bg_BG.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['objectchangelog'] = 'История';
+$labels['tabsharing'] = 'Споделяне';
diff --git a/plugins/libkolab/localization/ca_ES.inc b/plugins/libkolab/localization/ca_ES.inc
index 50fa5901..ba7c1f07 100644
--- a/plugins/libkolab/localization/ca_ES.inc
+++ b/plugins/libkolab/localization/ca_ES.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,15 +6,14 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'Compara';
+$labels['objectchangelog'] = 'Historial';
 $labels['revision'] = 'Revisió';
 $labels['user'] = 'Usuari';
 $labels['operation'] = 'Acció';
 $labels['actionappend'] = 'Desat';
 $labels['actionmove'] = 'Mogut';
 $labels['actiondelete'] = 'Suprimit';
-$labels['compare'] = 'Compara';
 $labels['showrevision'] = 'Mostra aquesta versió';
 $labels['restore'] = 'Restaura aquesta versió';
-
+$labels['tabsharing'] = 'Compartit';
diff --git a/plugins/libkolab/localization/cs_CZ.inc b/plugins/libkolab/localization/cs_CZ.inc
index b0883793..a03cd671 100644
--- a/plugins/libkolab/localization/cs_CZ.inc
+++ b/plugins/libkolab/localization/cs_CZ.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,15 +6,20 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
-$labels['revision'] = 'Verze';
+$labels['showhistory'] = 'Ukázat historii';
+$labels['compare'] = 'Porovnat';
+$labels['objectchangelog'] = 'Historie';
+$labels['objectdiff'] = 'Změny od $rev1 do $rev2';
+$labels['revision'] = 'Revize';
 $labels['user'] = 'Uživatel';
 $labels['operation'] = 'Činnost';
+$labels['actionreceive'] = 'Přijato';
 $labels['actionappend'] = 'Uloženo';
 $labels['actionmove'] = 'Přesunuto';
 $labels['actiondelete'] = 'Smazáno';
-$labels['compare'] = 'Porovnat';
+$labels['actionread'] = 'Označeno jako přečtené';
+$labels['actionflagset'] = 'Příznak nastaven';
+$labels['actionflagclear'] = 'Příznak odstraněn';
 $labels['showrevision'] = 'Ukázat tuto verzi';
 $labels['restore'] = 'Obnovit tuto verzi';
-
+$labels['tabsharing'] = 'Sdílení';
diff --git a/plugins/libkolab/localization/da_DK.inc b/plugins/libkolab/localization/da_DK.inc
index e48c75c7..dd71067a 100644
--- a/plugins/libkolab/localization/da_DK.inc
+++ b/plugins/libkolab/localization/da_DK.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,15 +6,20 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['showhistory'] = 'Vis historik';
+$labels['compare'] = 'Sammenlign';
+$labels['objectchangelog'] = 'Historik';
+$labels['objectdiff'] = 'Ændringer fra $rev1 til $rev2';
 $labels['revision'] = 'Revision';
 $labels['user'] = 'Bruger';
 $labels['operation'] = 'Handling';
+$labels['actionreceive'] = 'Modtaget';
 $labels['actionappend'] = 'Gemt';
 $labels['actionmove'] = 'Flyttet';
 $labels['actiondelete'] = 'Slettet';
-$labels['compare'] = 'Sammenlign';
+$labels['actionread'] = 'Markér som læst';
+$labels['actionflagset'] = 'Markering er angivet';
+$labels['actionflagclear'] = 'Markering er fjernet';
 $labels['showrevision'] = 'Vis denne version';
 $labels['restore'] = 'Genskab denne version';
-
+$labels['tabsharing'] = 'Deling';
diff --git a/plugins/libkolab/localization/de_CH.inc b/plugins/libkolab/localization/de_CH.inc
index 63558f88..e35b654f 100644
--- a/plugins/libkolab/localization/de_CH.inc
+++ b/plugins/libkolab/localization/de_CH.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,10 +6,6 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
-
-// history dialog
 $labels['showhistory'] = 'Verlauf anzeigen';
 $labels['compare'] = 'Vergleichen';
 $labels['objectchangelog'] = 'Verlauf';
@@ -27,5 +22,4 @@ $labels['actionflagset'] = 'Status gesetzt';
 $labels['actionflagclear'] = 'Status entfernt';
 $labels['showrevision'] = 'Diese Version anzeigen';
 $labels['restore'] = 'Diese Version wiederherstellen';
-$labels['objectchangelognotavailable'] = 'Verlauf ist nicht verfügbar für diese Nachricht';
-
+$labels['tabsharing'] = 'Freigabe';
diff --git a/plugins/libkolab/localization/de_DE.inc b/plugins/libkolab/localization/de_DE.inc
index 3ddc8848..1a9af0e5 100644
--- a/plugins/libkolab/localization/de_DE.inc
+++ b/plugins/libkolab/localization/de_DE.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,19 +6,20 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
-$labels['showhistory'] = 'Historie anzeigen';
+$labels['showhistory'] = 'Verlauf anzeigen';
 $labels['compare'] = 'Vergleichen';
-$labels['objectchangelog'] = 'Historie';
+$labels['objectchangelog'] = 'Verlauf';
 $labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
 $labels['revision'] = 'Version';
 $labels['user'] = 'Benutzer';
 $labels['operation'] = 'Aktion';
+$labels['actionreceive'] = 'Empfangen';
 $labels['actionappend'] = 'Gespeichert';
 $labels['actionmove'] = 'Verschoben';
 $labels['actiondelete'] = 'Gelöscht';
+$labels['actionread'] = 'Als gelesen markieren';
+$labels['actionflagset'] = 'Markierung festgelegt';
+$labels['actionflagclear'] = 'Markierung entfernt';
 $labels['showrevision'] = 'Diese Version anzeigen';
 $labels['restore'] = 'Diese Version wiederherstellen';
-$labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diese Nachricht';
-
+$labels['tabsharing'] = 'Teilen';
diff --git a/plugins/libkolab/localization/el.inc b/plugins/libkolab/localization/el.inc
new file mode 100644
index 00000000..db49a560
--- /dev/null
+++ b/plugins/libkolab/localization/el.inc
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['showhistory'] = 'Προβολή ιστορικού';
+$labels['compare'] = 'Σύγκριση';
+$labels['objectchangelog'] = 'Ιστορικό';
+$labels['user'] = 'Χρήστης';
+$labels['operation'] = 'Ενέργεια';
+$labels['actionreceive'] = 'Ληφθέντα';
+$labels['actionappend'] = 'Αποθηκεύτηκε';
+$labels['actiondelete'] = 'Διαγραμμένα';
diff --git a/plugins/libkolab/localization/en_US.inc b/plugins/libkolab/localization/en_US.inc
index 76c28e5c..9cbe8b75 100644
--- a/plugins/libkolab/localization/en_US.inc
+++ b/plugins/libkolab/localization/en_US.inc
@@ -27,5 +27,6 @@ $labels['actionflagset'] = 'Flag set';
 $labels['actionflagclear'] = 'Flag removed';
 $labels['showrevision'] = 'Show this version';
 $labels['restore'] = 'Restore this version';
-$labels['objectchangelognotavailable'] = 'History is not available for this message';
-
+$labels['objectchangelognotavailable'] = 'History is not available for this object.';
+$labels['tabsharing'] = 'Sharing';
+$labels['aclnorights'] = 'You do not have administrator rights for this folder.';
diff --git a/plugins/libkolab/localization/es_AR.inc b/plugins/libkolab/localization/es_AR.inc
index ae2371b1..a7ebf12d 100644
--- a/plugins/libkolab/localization/es_AR.inc
+++ b/plugins/libkolab/localization/es_AR.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,15 +6,22 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['showhistory'] = 'Mostrar Historial';
+$labels['compare'] = 'Comparar';
+$labels['objectchangelog'] = 'Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
 $labels['revision'] = 'Revisión';
 $labels['user'] = 'Usuario';
 $labels['operation'] = 'Acción';
+$labels['actionreceive'] = 'Recibido';
 $labels['actionappend'] = 'Guardado';
 $labels['actionmove'] = 'Movido';
 $labels['actiondelete'] = 'Eliminado';
-$labels['compare'] = 'Comparar';
+$labels['actionread'] = 'Marcado como Leído';
+$labels['actionflagset'] = 'Marca realizada';
+$labels['actionflagclear'] = 'Marca eliminada';
 $labels['showrevision'] = 'Mostrar esta versión';
 $labels['restore'] = 'Recuperar esta versión';
-
+$labels['objectchangelognotavailable'] = 'El historial no está disponible para este objeto.';
+$labels['tabsharing'] = 'Compartir';
+$labels['aclnorights'] = 'No tiene permisos de administrador para esta carpeta.';
diff --git a/plugins/libkolab/localization/es_ES.inc b/plugins/libkolab/localization/es_ES.inc
index 597b203d..a1ba1337 100644
--- a/plugins/libkolab/localization/es_ES.inc
+++ b/plugins/libkolab/localization/es_ES.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,8 +6,20 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['showhistory'] = 'Mostrar historial';
+$labels['compare'] = 'Comparar';
+$labels['objectchangelog'] = 'Historia';
+$labels['objectdiff'] = 'Cambiar de $rev1 a $rev2';
+$labels['revision'] = 'Revisión';
 $labels['user'] = 'Usuario';
 $labels['operation'] = 'Acción';
-
+$labels['actionreceive'] = 'Recibido';
+$labels['actionappend'] = 'Salvado';
+$labels['actionmove'] = 'Movido';
+$labels['actiondelete'] = 'Borrado';
+$labels['actionread'] = 'Marcado como leído';
+$labels['actionflagset'] = 'Marca establecita';
+$labels['actionflagclear'] = 'Marca eliminada';
+$labels['showrevision'] = 'Mostrar esta versión';
+$labels['restore'] = 'Restaurar esta versión';
+$labels['tabsharing'] = 'Compartir';
diff --git a/plugins/libkolab/localization/et_EE.inc b/plugins/libkolab/localization/et_EE.inc
new file mode 100644
index 00000000..1f27b2da
--- /dev/null
+++ b/plugins/libkolab/localization/et_EE.inc
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['showhistory'] = 'Näita ajalugu';
+$labels['compare'] = 'Võrdle';
+$labels['objectchangelog'] = 'Ajalugu';
+$labels['objectdiff'] = 'Muudatused versioonide $rev1 ja $rev2 vahel';
+$labels['revision'] = 'Versioon';
+$labels['user'] = 'Kasutaja';
+$labels['operation'] = 'Toiming';
+$labels['actionreceive'] = 'Saadud';
+$labels['actionappend'] = 'Salvestatud';
+$labels['actionmove'] = 'Liigutatud';
+$labels['actiondelete'] = 'Kustutatud';
+$labels['actionread'] = 'Märgitud loetuks';
+$labels['actionflagset'] = 'Lisa lipp';
+$labels['actionflagclear'] = 'Lipp on eemaldatud';
+$labels['showrevision'] = 'Näita seda versiooni';
+$labels['restore'] = 'Taasta see versioon';
+$labels['objectchangelognotavailable'] = 'Selle objekti ajalugu pole saadaval.';
+$labels['tabsharing'] = 'Jagamine';
+$labels['aclnorights'] = 'Sul pole selles kaustas administraatori õiguseid.';
diff --git a/plugins/libkolab/localization/fi_FI.inc b/plugins/libkolab/localization/fi_FI.inc
index cfef2625..a31b414d 100644
--- a/plugins/libkolab/localization/fi_FI.inc
+++ b/plugins/libkolab/localization/fi_FI.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,15 +6,22 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['showhistory'] = 'Näytä historia';
+$labels['compare'] = 'Vertaa';
+$labels['objectchangelog'] = 'Historia';
+$labels['objectdiff'] = 'Muutokset versiosta $rev1 versioon $rev2';
 $labels['revision'] = 'Versio';
 $labels['user'] = 'Käyttäjä';
 $labels['operation'] = 'Toiminto';
+$labels['actionreceive'] = 'Vastaanotettu';
 $labels['actionappend'] = 'Tallennettu';
 $labels['actionmove'] = 'Siirretty';
 $labels['actiondelete'] = 'Poistettu';
-$labels['compare'] = 'Vertaa';
+$labels['actionread'] = 'Merkitty luetuksi';
+$labels['actionflagset'] = 'Lippu asetettu';
+$labels['actionflagclear'] = 'Lippu poistettu';
 $labels['showrevision'] = 'Näytä tämä versio';
 $labels['restore'] = 'Palauta tämä versio';
-
+$labels['objectchangelognotavailable'] = 'Tälle objektille ei ole historiaa saatavilla.';
+$labels['tabsharing'] = 'Jakaminen';
+$labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän kansioon.';
diff --git a/plugins/libkolab/localization/fr_FR.inc b/plugins/libkolab/localization/fr_FR.inc
index 707c5a34..afca7a75 100644
--- a/plugins/libkolab/localization/fr_FR.inc
+++ b/plugins/libkolab/localization/fr_FR.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,16 +6,20 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['showhistory'] = 'Montrer historique';
 $labels['compare'] = 'Comparer';
 $labels['objectchangelog'] = 'Historique';
+$labels['objectdiff'] = 'Modifications depuis $rev1 jusqu\'à $rev2';
 $labels['revision'] = 'Version';
 $labels['user'] = 'Utilisateur';
 $labels['operation'] = 'Action';
+$labels['actionreceive'] = 'Reçu';
 $labels['actionappend'] = 'Sauvegardé';
 $labels['actionmove'] = 'Déplacé';
 $labels['actiondelete'] = 'Supprimé';
+$labels['actionread'] = 'Marqué lu';
+$labels['actionflagset'] = 'Marque mise';
+$labels['actionflagclear'] = 'Marque retirée';
 $labels['showrevision'] = 'Afficher cette version';
 $labels['restore'] = 'Restaurer cette version';
-
+$labels['tabsharing'] = 'Partage';
diff --git a/plugins/libkolab/localization/he_IL.inc b/plugins/libkolab/localization/he_IL.inc
new file mode 100644
index 00000000..ebdaaf91
--- /dev/null
+++ b/plugins/libkolab/localization/he_IL.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['compare'] = 'Compare';
+$labels['objectchangelog'] = 'History';
+$labels['revision'] = 'Revision';
+$labels['user'] = 'User';
+$labels['operation'] = 'Action';
+$labels['actionappend'] = 'Saved';
+$labels['actionmove'] = 'Moved';
+$labels['actiondelete'] = 'Deleted';
+$labels['showrevision'] = 'Show this version';
+$labels['restore'] = 'Restore this version';
+$labels['tabsharing'] = 'Sharing';
diff --git a/plugins/libkolab/localization/hr_HR.inc b/plugins/libkolab/localization/hr_HR.inc
new file mode 100644
index 00000000..ebdaaf91
--- /dev/null
+++ b/plugins/libkolab/localization/hr_HR.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['compare'] = 'Compare';
+$labels['objectchangelog'] = 'History';
+$labels['revision'] = 'Revision';
+$labels['user'] = 'User';
+$labels['operation'] = 'Action';
+$labels['actionappend'] = 'Saved';
+$labels['actionmove'] = 'Moved';
+$labels['actiondelete'] = 'Deleted';
+$labels['showrevision'] = 'Show this version';
+$labels['restore'] = 'Restore this version';
+$labels['tabsharing'] = 'Sharing';
diff --git a/plugins/libkolab/localization/hu_HU.inc b/plugins/libkolab/localization/hu_HU.inc
new file mode 100644
index 00000000..eba7ef7f
--- /dev/null
+++ b/plugins/libkolab/localization/hu_HU.inc
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['actiondelete'] = 'Deleted';
+$labels['tabsharing'] = 'Megosztás';
diff --git a/plugins/libkolab/localization/it_IT.inc b/plugins/libkolab/localization/it_IT.inc
index 9073b123..b9b86d92 100644
--- a/plugins/libkolab/localization/it_IT.inc
+++ b/plugins/libkolab/localization/it_IT.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,15 +6,14 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'Confronta';
+$labels['objectchangelog'] = 'Storico';
 $labels['revision'] = 'Revisione';
 $labels['user'] = 'Utente';
 $labels['operation'] = 'Azione';
 $labels['actionappend'] = 'Salvato';
 $labels['actionmove'] = 'Spostato';
 $labels['actiondelete'] = 'Cancellato';
-$labels['compare'] = 'Confronta';
 $labels['showrevision'] = 'Mostra questa versione';
 $labels['restore'] = 'Rirpistina questa versione';
-
+$labels['tabsharing'] = 'Condivisione';
diff --git a/plugins/libkolab/localization/ja_JP.inc b/plugins/libkolab/localization/ja_JP.inc
new file mode 100644
index 00000000..a278bbbe
--- /dev/null
+++ b/plugins/libkolab/localization/ja_JP.inc
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['showhistory'] = '履歴表示';
+$labels['compare'] = '比較';
+$labels['objectchangelog'] = '履歴';
+$labels['objectdiff'] = '$rev1 から $rev2 への変更';
+$labels['revision'] = 'リヴィジョン';
+$labels['user'] = 'ユーザ';
+$labels['operation'] = '行動';
+$labels['actionreceive'] = '受信済';
+$labels['actionappend'] = '保存済';
+$labels['actionmove'] = '移動済';
+$labels['actiondelete'] = '削除済';
+$labels['actionread'] = '既読としてマーク';
+$labels['actionflagset'] = 'フラグ設定';
+$labels['actionflagclear'] = 'フラグ削除';
+$labels['showrevision'] = '現在のバージョンの表示';
+$labels['restore'] = 'このバージョンを復元';
+$labels['tabsharing'] = '共有';
diff --git a/plugins/libkolab/localization/ko_KR.inc b/plugins/libkolab/localization/ko_KR.inc
new file mode 100644
index 00000000..357b1feb
--- /dev/null
+++ b/plugins/libkolab/localization/ko_KR.inc
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['objectchangelog'] = '이력';
diff --git a/plugins/libkolab/localization/lv.inc b/plugins/libkolab/localization/lv.inc
new file mode 100644
index 00000000..272fc1e6
--- /dev/null
+++ b/plugins/libkolab/localization/lv.inc
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['objectchangelog'] = 'Vēsture';
+$labels['objectdiff'] = 'Izmaiņas no $rev1 uz $rev2';
+$labels['tabsharing'] = 'Dalīšanās';
diff --git a/plugins/libkolab/localization/nl_NL.inc b/plugins/libkolab/localization/nl_NL.inc
index c0930b4e..787212c5 100644
--- a/plugins/libkolab/localization/nl_NL.inc
+++ b/plugins/libkolab/localization/nl_NL.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,10 +6,12 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['showhistory'] = 'Geschiedenis tonen';
+$labels['compare'] = 'Vergelijken';
+$labels['objectchangelog'] = 'Geschiedenis';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
 $labels['user'] = 'Gebruiker';
 $labels['actionappend'] = 'Opgeslagen';
 $labels['actionmove'] = 'Verplaatst';
 $labels['actiondelete'] = 'Verwijderd';
-$labels['compare'] = 'Vergelijken';
+$labels['tabsharing'] = 'Delen';
diff --git a/plugins/libkolab/localization/pl_PL.inc b/plugins/libkolab/localization/pl_PL.inc
index d37797d0..a30a095e 100644
--- a/plugins/libkolab/localization/pl_PL.inc
+++ b/plugins/libkolab/localization/pl_PL.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,14 +6,15 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'Porównaj';
+$labels['objectchangelog'] = 'Historia';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
 $labels['revision'] = 'Wersja';
 $labels['user'] = 'Użytkownik';
 $labels['operation'] = 'Akcja';
 $labels['actionappend'] = 'Zapisane';
 $labels['actionmove'] = 'Przeniesione';
 $labels['actiondelete'] = 'Usunięte';
-$labels['compare'] = 'Porównaj';
 $labels['showrevision'] = 'Pokaż tą wersję';
 $labels['restore'] = 'Przywróć tą wersję';
+$labels['tabsharing'] = 'Udostępnianie';
diff --git a/plugins/libkolab/localization/pt_BR.inc b/plugins/libkolab/localization/pt_BR.inc
new file mode 100644
index 00000000..455752de
--- /dev/null
+++ b/plugins/libkolab/localization/pt_BR.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['objectchangelog'] = 'História';
+$labels['user'] = 'Usuário';
+$labels['actiondelete'] = 'Deletado';
+$labels['tabsharing'] = 'Compartilhamento';
diff --git a/plugins/libkolab/localization/pt_PT.inc b/plugins/libkolab/localization/pt_PT.inc
new file mode 100644
index 00000000..7b61616d
--- /dev/null
+++ b/plugins/libkolab/localization/pt_PT.inc
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['compare'] = 'Comparar';
+$labels['objectchangelog'] = 'Histórico';
+$labels['objectdiff'] = 'Diferenças entre $rev1 e $rev2';
+$labels['revision'] = 'Revisão';
+$labels['user'] = 'Utilizador';
+$labels['operation'] = 'Ação';
+$labels['actionappend'] = 'Guardado';
+$labels['actionmove'] = 'Movido';
+$labels['actiondelete'] = 'Eliminado';
+$labels['showrevision'] = 'Mostrar esta versão';
+$labels['restore'] = 'Restaurar esta versão';
+$labels['tabsharing'] = 'Partilha';
diff --git a/plugins/libkolab/localization/ru_RU.inc b/plugins/libkolab/localization/ru_RU.inc
new file mode 100644
index 00000000..f92d5b52
--- /dev/null
+++ b/plugins/libkolab/localization/ru_RU.inc
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['showhistory'] = 'Показать Историю';
+$labels['compare'] = 'Сравнить';
+$labels['objectchangelog'] = 'История';
+$labels['objectdiff'] = 'Изменения с $rev1 до $rev2';
+$labels['revision'] = 'Ревизия';
+$labels['user'] = 'Пользователь';
+$labels['operation'] = 'Действие';
+$labels['actionreceive'] = 'Получено';
+$labels['actionappend'] = 'Сохранено';
+$labels['actionmove'] = 'Перемещено';
+$labels['actiondelete'] = 'Удалённые';
+$labels['actionread'] = 'Отмечено как прочитаное';
+$labels['actionflagset'] = 'Флаг установлен';
+$labels['actionflagclear'] = 'Флаг удалён';
+$labels['showrevision'] = 'Показать эту версию';
+$labels['restore'] = 'Восстановить эту версию';
+$labels['tabsharing'] = 'Поделиться';
diff --git a/plugins/libkolab/localization/sl_SI.inc b/plugins/libkolab/localization/sl_SI.inc
index 1b69ee1d..0d030ab3 100644
--- a/plugins/libkolab/localization/sl_SI.inc
+++ b/plugins/libkolab/localization/sl_SI.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,14 +6,14 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'Primerjaj';
+$labels['objectchangelog'] = 'Zgodovina';
 $labels['revision'] = 'Verzija';
 $labels['user'] = 'Uporabnik';
 $labels['operation'] = 'Dejanje';
 $labels['actionappend'] = 'Shranjeno';
 $labels['actionmove'] = 'Premaknjeno';
 $labels['actiondelete'] = 'Izbrisano';
-$labels['compare'] = 'Primerjaj';
 $labels['showrevision'] = 'Prikaži to verzijo';
 $labels['restore'] = 'Obnovi to verzijo';
+$labels['tabsharing'] = 'Deli z ostalimi';
diff --git a/plugins/libkolab/localization/sv_SE.inc b/plugins/libkolab/localization/sv_SE.inc
index 32cde22e..0d07dab6 100644
--- a/plugins/libkolab/localization/sv_SE.inc
+++ b/plugins/libkolab/localization/sv_SE.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,14 +6,14 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'Jämför';
+$labels['objectchangelog'] = 'Historik';
 $labels['revision'] = 'Revision';
 $labels['user'] = 'Användare';
 $labels['operation'] = 'Åtgärd';
 $labels['actionappend'] = 'Sparad';
 $labels['actionmove'] = 'Flyttad';
 $labels['actiondelete'] = 'Borttagen';
-$labels['compare'] = 'Jämför';
 $labels['showrevision'] = 'Visa denna version';
 $labels['restore'] = 'Återställ denna verson';
+$labels['tabsharing'] = 'Delning';
diff --git a/plugins/libkolab/localization/th_TH.inc b/plugins/libkolab/localization/th_TH.inc
index 63791c42..85ea5107 100644
--- a/plugins/libkolab/localization/th_TH.inc
+++ b/plugins/libkolab/localization/th_TH.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,14 +6,14 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'เปรียบเทียบ';
+$labels['objectchangelog'] = 'ประวัติ';
 $labels['revision'] = 'รุ่นการปรับปรุง';
 $labels['user'] = 'ผู้ใช้';
 $labels['operation'] = 'การกระทำ';
 $labels['actionappend'] = 'บันทึกเรียบร้อย';
 $labels['actionmove'] = 'ย้ายเรียบร้อย';
 $labels['actiondelete'] = 'ลบเรียบร้อย';
-$labels['compare'] = 'เปรียบเทียบ';
 $labels['showrevision'] = 'แสดงรุ่นการปรับปรุงนี้';
 $labels['restore'] = 'ย้อนกลับไปยังรุ่นการปรับปรุงนี้';
+$labels['tabsharing'] = 'แบ่งปัน';
diff --git a/plugins/libkolab/localization/uk_UA.inc b/plugins/libkolab/localization/uk_UA.inc
index 7fc32e2e..0d46738f 100644
--- a/plugins/libkolab/localization/uk_UA.inc
+++ b/plugins/libkolab/localization/uk_UA.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Localizations for the Kolab libkolab plugin
  *
@@ -7,14 +6,14 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
  */
-
-$labels = array();
+$labels['compare'] = 'Порівняти';
+$labels['objectchangelog'] = 'Історія';
 $labels['revision'] = 'Ревізія';
 $labels['user'] = 'Користувач';
 $labels['operation'] = 'Дія';
 $labels['actionappend'] = 'Збережено';
 $labels['actionmove'] = 'Переміщено';
 $labels['actiondelete'] = 'Вилучено';
-$labels['compare'] = 'Порівняти';
 $labels['showrevision'] = 'Показати дану весію';
 $labels['restore'] = 'Відновити дану версію';
+$labels['tabsharing'] = 'Спільне використання';
diff --git a/plugins/libkolab/localization/vi_VN.inc b/plugins/libkolab/localization/vi_VN.inc
new file mode 100644
index 00000000..2eccd8d0
--- /dev/null
+++ b/plugins/libkolab/localization/vi_VN.inc
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['compare'] = 'Compare';
+$labels['objectchangelog'] = 'History';
+$labels['objectdiff'] = 'Changes from revisions $rev';
+$labels['revision'] = 'Revision';
+$labels['user'] = 'User';
+$labels['operation'] = 'Action';
+$labels['actionappend'] = 'Saved';
+$labels['actionmove'] = 'Moved';
+$labels['actiondelete'] = 'Deleted';
+$labels['showrevision'] = 'Show this version';
+$labels['restore'] = 'Restore this version';
+$labels['tabsharing'] = 'Sharing';
diff --git a/plugins/libkolab/localization/zh_CN.inc b/plugins/libkolab/localization/zh_CN.inc
new file mode 100644
index 00000000..e523553e
--- /dev/null
+++ b/plugins/libkolab/localization/zh_CN.inc
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['showhistory'] = '显示历史';
+$labels['compare'] = '对比';
+$labels['objectchangelog'] = '历史';
+$labels['user'] = '用户';
+$labels['operation'] = '应用';
+$labels['actionread'] = '标记为已读';
+$labels['tabsharing'] = '分享';
diff --git a/plugins/libkolab/localization/zh_TW.inc b/plugins/libkolab/localization/zh_TW.inc
new file mode 100644
index 00000000..ebdaaf91
--- /dev/null
+++ b/plugins/libkolab/localization/zh_TW.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Localizations for the Kolab libkolab plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libkolab/
+ */
+$labels['compare'] = 'Compare';
+$labels['objectchangelog'] = 'History';
+$labels['revision'] = 'Revision';
+$labels['user'] = 'User';
+$labels['operation'] = 'Action';
+$labels['actionappend'] = 'Saved';
+$labels['actionmove'] = 'Moved';
+$labels['actiondelete'] = 'Deleted';
+$labels['showrevision'] = 'Show this version';
+$labels['restore'] = 'Restore this version';
+$labels['tabsharing'] = 'Sharing';
diff --git a/plugins/libkolab/skins/elastic/images/eye.svg b/plugins/libkolab/skins/elastic/images/eye.svg
new file mode 100644
index 00000000..f679fdc2
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/images/eye.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="#f0f3f4" d="M569.354 231.631C512.969 135.949 407.81 72 288 72 168.14 72 63.004 135.994 6.646 231.631a47.999 47.999 0 0 0 0 48.739C63.031 376.051 168.19 440 288 440c119.86 0 224.996-63.994 281.354-159.631a47.997 47.997 0 0 0 0-48.738zM288 392c-75.162 0-136-60.827-136-136 0-75.162 60.826-136 136-136 75.162 0 136 60.826 136 136 0 75.162-60.826 136-136 136zm104-136c0 57.438-46.562 104-104 104s-104-46.562-104-104c0-17.708 4.431-34.379 12.236-48.973l-.001.032c0 23.651 19.173 42.823 42.824 42.823s42.824-19.173 42.824-42.823c0-23.651-19.173-42.824-42.824-42.824l-.032.001C253.621 156.431 270.292 152 288 152c57.438 0 104 46.562 104 104z"/></svg>
\ No newline at end of file
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
new file mode 100644
index 00000000..a228a3ee
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -0,0 +1,1942 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for calendar plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.toolbarmenu.listing li {
+    a.calendarlink:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
+
+    a.send:before {
+        content: @fa-var-paper-plane;
+    }
+}
+
+// Icon for resources in autocompletion list
+.listing.iconized li.resource > i:before {
+    content: @fa-var-cube;
+}
+
+a.button.today:before {
+    .font-icon-regular(@fa-var-calendar);
+}
+
+a.button.date:before {
+    .font-icon-regular(@fa-var-calendar-alt);
+}
+
+.listing {
+    li {
+        & > div {
+            &.calendar .calname:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-calendar-alt;
+            }
+
+            &.calendar.cal---invitation--pending .calname:before,
+            &.calendar.cal---invitation--declined .calname:before {
+                .font-icon-regular(@fa-var-calendar-alt);
+            }
+
+            &.calendar.cal-__bdays__ .calname:before {
+                content: @fa-var-birthday-cake;
+            }
+
+            &.calendar.cal---invitation--pending,
+            &.calendar.cal---invitation--declined,
+            &.calendar.cal-__bdays__ {
+                font-style: italic;
+
+                a.quickview {
+                    padding-right: .25rem;
+                }
+
+                a.calname {
+                    padding-right: 4em;
+                }
+
+                .count {
+                    right: 5.5em;
+                    font-style: normal;
+                }
+            }
+        }
+
+        // Calednars list element (color indicator) used in Larry
+        span.handle {
+            display: none;
+        }
+    }
+}
+
+#calendarcategories {
+    .input-group:not(:last-child) {
+        margin-bottom: .25rem;
+    }
+}
+
+fieldset.categories .input-group {
+    .minicolors-input {
+        border-radius: 0;
+    }
+
+    .minicolors + .input-group-append {
+        margin-left: 0;
+    }
+
+    a.button.create {
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-plus;
+            line-height: 1;
+        }
+    }
+}
+
+.calendar-invitebox {
+    & > i.icon:before {
+        content: @fa-var-calendar !important;
+    }
+}
+
+.calendar-agenda-preview {
+    display: none;
+    margin-top: .5rem;
+    border-top: 1px solid #ddd;
+
+    h3 {
+        margin-top: .5rem;
+    }
+
+    .event-row {
+        white-space: nowrap;
+        .overflow-ellipsis;
+
+        &.current {
+            color: #333;
+            font-weight: bold;
+        }
+
+        &.no-event {
+            font-style: italic;
+        }
+
+        &.fc-invitation-needs-action {
+            color: @color-black-shade-text;
+
+            .event-title {
+                font-style: italic;
+            }
+        }
+    }
+
+    .event-title {
+        padding-left: .5rem;
+    }
+
+    .event-date {
+    }
+}
+
+#calendar.content {
+    overflow: hidden !important; // fullcalendar widget implements scrolling on its own
+    position: relative;
+}
+
+.calendar-datepicker {
+    // overwrite jQuery-UI datepicker styles
+    .ui-datepicker {
+        margin: 0 !important;
+        border: 0;
+        border-radius: 0;
+        width: auto;
+        min-width: auto !important;
+        font-size: .9rem;
+        background-color: @color-black-shade-bg;
+
+        table {
+            margin: 0;
+        }
+
+        td a {
+            font-size: .9rem !important;
+        }
+    }
+
+    .ui-datepicker-header {
+        background-color: @color-black-shade-bg;
+        border-top: 1px solid @color-layout-border;
+    }
+
+    .ui-dialog & {
+        .ui-datepicker {
+            background: transparent;
+        }
+
+        .ui-datepicker-header {
+            background: transparent;
+            border: 0;
+        }
+
+        td a {
+            line-height: 3em !important;
+            font-size: 1rem !important;
+        }
+    }
+}
+
+body.quickview-active .fc-content {
+    background: data-uri("image/svg+xml;charset=utf-8", "../images/eye.svg") center no-repeat;
+    background-size: 50%;
+}
+
+// Fullcalendar styles
+@color-calendar-border: @color-layout-border;
+@color-calendar-free-bg: fadeout(@color-black-shade-text, 97%);
+
+.fc {
+    flex: auto !important;
+
+    .fc-header {
+        tr {
+            background-color: @color-black-shade-bg;
+        }
+    }
+
+    .fc-header-left {
+        width: 25%;
+
+        span {
+            display: none;
+        }
+
+    }
+
+    .fc-header-center {
+        text-align: center;
+
+        h2 {
+            margin: 0;
+            color: @color-black-shade-text;
+            white-space: nowrap;
+        }
+    }
+
+    .fc-header-right {
+        width: 25%;
+        text-align: right;
+
+        span {
+            display: none;
+        }
+    }
+
+    .btn-group {
+        padding: .5rem;
+    }
+
+    .fc-header-title {
+        h2 {
+            font-size: 1.25rem;
+            font-weight: bold;
+        }
+    }
+
+    .fc-view {
+        width: 100%;
+        overflow: hidden;
+    }
+
+    // Cell Styles
+
+    .fc-widget-header,    // <th>, usually
+    .fc-widget-content {  // <td>, usually
+        border: 1px solid @color-calendar-border;
+    }
+
+    .fc-cell-overlay { // semi-transparent rectangle while dragging
+        background: #bce8f1;
+        opacity: .3;
+    }
+
+    // Buttons
+
+    .fc-button {
+        position: relative;
+        display: inline-block;
+        padding: 0 .6em;
+        overflow: hidden;
+        height: 1.9em;
+        line-height: 1.9em;
+        white-space: nowrap;
+        cursor: pointer;
+    }
+
+    // Button states
+    // borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
+
+    .fc-state-highlight { // <td> today cell, TODO: add .fc-today to <th>
+        background: fadeout(@color-main, 92%);
+    }
+
+/*
+    .fc-state-default {
+        border: 1px solid;
+        background-color: #f4f4f4;
+    }
+
+    .fc-state-hover,
+    .fc-state-down,
+    .fc-state-active,
+    .fc-state-disabled {
+        color: #333333;
+        background-color: #e6e6e6;
+    }
+    .fc-state-hover {
+        color: #333333;
+        text-decoration: none;
+    }
+
+    .fc-state-down,
+    .fc-state-active {
+        background-color: #cccccc;
+        outline: 0;
+    }
+*/
+    .fc-state-disabled {
+        cursor: default;
+        opacity: 0.65;
+    }
+
+    // Global Event Styles
+
+    .fc-event-container {
+        & > * {
+            z-index: 8;
+        }
+
+        & > .ui-draggable-dragging,
+        & > .ui-resizable-resizing {
+            z-index: 9;
+        }
+    }
+
+    .fc-event {
+        border: 1px solid #3a87ad; // default BORDER color
+        background-color: #3a87ad; // default BACKGROUND color
+        color: #fff;               // default TEXT color
+        font-size: .85em;
+        cursor: default;
+
+        .fc-rtl & {
+            text-align: right;
+        }
+    }
+
+    a.fc-event {
+        text-decoration: none;
+    }
+
+    a.fc-event,
+    .fc-event-draggable {
+        cursor: pointer;
+    }
+
+    .fc-event-inner {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+    }
+
+    .fc-event-time,
+    .fc-event-title {
+        padding: 0 1px;
+    }
+
+    .ui-resizable-handle {
+        z-index: 99999;
+    }
+
+    // Horizontal Events
+
+    .fc-event-hori {
+        border-width: 1px 0;
+        margin-bottom: 1px;
+    }
+
+    .fc-ltr .fc-event-hori.fc-event-start,
+    .fc-rtl .fc-event-hori.fc-event-end {
+        border-left-width: 1px;
+    }
+
+    .fc-ltr .fc-event-hori.fc-event-end,
+    .fc-rtl .fc-event-hori.fc-event-start {
+        border-right-width: 1px;
+    }
+
+    // resizable
+
+    .fc-event-hori {
+        .ui-resizable-e {
+            cursor: e-resize;
+        }
+
+        .ui-resizable-w {
+            cursor: w-resize;
+        }
+    }
+
+    // Reusable Separate-border Table
+
+    .fc-border-separate {
+        border-collapse: separate;
+
+        th,
+        td {
+            border-width: 1px 0 0 1px;
+
+            &.fc-last {
+                border-right-width: 1px;
+            }
+        }
+
+        tr.fc-last th,
+        tr.fc-last td {
+            border-bottom-width: 1px;
+        }
+
+        tbody tr.fc-first td,
+        tbody tr.fc-first th {
+            border-top-width: 0;
+        }
+    }
+
+    .fc-event-date,
+    .fc-event-time {
+        white-space: nowrap;
+    }
+
+    // Month View, Basic Week View, Basic Day View
+
+    .fc-week-number {
+        width: 1%;
+        color: tint(@color-black-shade-text, 50%) !important;
+        border-left: 0;
+        font-size: .9rem;
+
+        div {
+            padding: 0 2px;
+        }
+    }
+
+    .fc-day {
+        vertical-align: top;
+    }
+
+    .fc-day-header {
+        color: @color-black-shade-text;
+    }
+
+    .fc-grid {
+        th {
+            text-align: center;
+        }
+
+        .fc-day-number {
+            float: right;
+            padding: 0 2px;
+            font-size: .9rem;
+        }
+
+        .fc-other-month .fc-day-number {
+            opacity: 0.3;
+        }
+
+        .fc-day-content {
+            clear: both;
+            padding: 2px 2px 1px; // distance between events and day edges
+        }
+
+        // event styles
+        .fc-event-time {
+            font-weight: bold;
+            white-space: nowrap;
+        }
+
+        // right-to-left
+        .fc-rtl & .fc-day-number {
+            float: left;
+        }
+
+        .fc-rtl & .fc-event-time {
+            float: right;
+        }
+    }
+
+    .fc-more-link {
+        font-size: 0.85em;
+        white-space: nowrap;
+        text-decoration: none;
+        cursor: pointer;
+        padding: 1px;
+        color: @color-link !important;
+    }
+
+    // Agenda Week View, Agenda Day View
+
+    .fc-agenda-days {
+        th {
+            text-align: center;
+        }
+
+        .fc-widget-header {
+            color: @color-black-shade-text;
+        }
+    }
+
+    .fc-agenda {
+        table {
+            border-collapse: separate;
+        }
+
+        .fc-agenda-axis {
+            width: 50px;
+            padding: 0 4px;
+            vertical-align: middle;
+            text-align: center;
+            white-space: nowrap;
+            font-weight: normal;
+            font-size: .9rem;
+            border-left: 0;
+            color: @color-black-shade-text;
+        }
+
+        .fc-week-number {
+            font-weight: bold;
+        }
+
+        .fc-day-content {
+            padding: 2px 2px 1px;
+        }
+    }
+
+    // make axis border take precedence
+
+    .fc-agenda-days .fc-agenda-axis {
+        border-right-width: 1px;
+    }
+
+    .fc-agenda-days .fc-col0 {
+        border-left-width: 0;
+    }
+
+    // all-day area
+
+    .fc-agenda-allday {
+        th {
+            border-width: 0 1px;
+        }
+
+        .fc-day-content {
+            min-height: 34px;
+        }
+    }
+
+    // divider (between all-day and slots)
+
+    .fc-agenda-divider-inner {
+        height: 1px;
+        overflow: hidden;
+    }
+
+    // slot rows
+
+    .fc-agenda-slots {
+        th {
+            border-width: 1px 1px 0;
+        }
+
+        td {
+            border-width: 1px 0 0;
+            background: none;
+        }
+
+        td div {
+            height: 20px;
+        }
+
+        tr.fc-slot0 th,
+        tr.fc-slot0 td {
+            border-top-width: 0;
+        }
+
+        tr.fc-minor th,
+        tr.fc-minor td {
+            border-top-style: dotted;
+        }
+    }
+
+    // Vertical Events
+
+    .fc-event-vert {
+        border-width: 0 1px;
+
+        .fc-event-head,
+        .fc-event-content {
+            position: relative;
+            z-index: 2;
+            width: 100%;
+            overflow: hidden;
+        }
+
+        &.fc-event-start {
+            border-top-width: 1px;
+        }
+
+        &.fc-event-end {
+            border-bottom-width: 1px;
+        }
+
+        .fc-event-time {
+            white-space: nowrap;
+            font-size: 10px;
+            font-weight: bold;
+        }
+
+        .fc-event-inner {
+            position: relative;
+            z-index: 2;
+        }
+
+        .fc-event-bg { // makes the event lighter w/ a semi-transparent overlay
+            position: absolute;
+            z-index: 1;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: #fff;
+            opacity: .25;
+        }
+    }
+
+    // resizable
+
+    .fc-event-vert .ui-resizable-s {
+        bottom: 0        !important; // importants override pre jquery ui 1.7 styles
+        width: 100%      !important;
+        height: 8px      !important;
+        overflow: hidden !important;
+        line-height: 8px !important;
+        font-size: 11px  !important;
+        font-family: monospace;
+        text-align: center;
+        cursor: s-resize;
+    }
+
+    .fc-timeline {
+        position: absolute;
+        width: 100%;
+        left: 0;
+        margin: 0;
+        padding: 0;
+        border: none;
+        border-top: 2px solid @color-success;
+        z-index: 999;
+    }
+
+    // List view  (by bruederli@kolabsys.com)
+
+    .fc-view-list,
+    .fc-view-table {
+        border-left: 0;
+        border-bottom: 0;
+        border-top: 1px solid @color-layout-border;
+        width: auto;
+
+        .fc-list-header,
+        td.fc-list-header {
+            border-width: 0;
+            border-bottom-width: 1px;
+            padding: 3px 5px;
+            font-weight: bold;
+        }
+
+        .fc-event {
+            font-size: 1rem;
+        }
+    }
+
+    .fc-list-section {
+        padding: 4px 2px;
+        border-width: 0;
+        border-bottom-width: 1px;
+
+        .fc-event {
+            position: relative;
+            margin: 1px 2px 3px 2px;
+
+            td:not(.fc-event-handle) {
+                vertical-align: top;
+            }
+        }
+
+        .fc-event-time {
+            .overflow-ellipsis;
+        }
+
+        .fc-event-title {
+            font-weight: bold;
+        }
+    }
+
+    .fc-view-list .fc-last {
+        border-bottom: 0;
+    }
+
+    .fc-view-table {
+        tr.fc-event {
+            background: inherit;
+            color: inherit;
+
+            td {
+                padding: 2px;
+                border-bottom: 1px solid @color-calendar-border;
+            }
+
+            td.fc-event-handle {
+                padding: 7px 8px 6px 5px;
+                vertical-align: top;
+            }
+        }
+
+        .fc-first td.fc-list-header {
+            border-top-width: 0;
+        }
+
+        .fc-event-handle {
+            .fc-event-inner {
+                display: block;
+                width: 8px;
+                height: 10px;
+            }
+        }
+
+        table {
+            table-layout: fixed;
+            width: 100%;
+        }
+
+        .fc-event-inner {
+            border-color: inherit;
+            background-color: inherit;
+        }
+
+        col.fc-event-handle {
+            width: 18px;
+        }
+
+        col.fc-event-date {
+            width: 7em;
+            white-space: nowrap;
+            padding-right: 1em;
+
+            .fc-list-day & {
+                width: 1px;
+            }
+        }
+
+        col.fc-event-time {
+            width: 9em;
+            white-space: nowrap;
+            padding-right: 1em;
+        }
+    }
+
+    .fc-event-hori.fc-type-freebusy,
+    .fc-event-vert.fc-type-freebusy {
+        opacity: 0.6;
+
+        .fc-event-title {
+            position: absolute;
+            top: -5000px;
+        }
+    }
+
+    .fc-event-row.fc-type-freebusy td {
+        color: #999;
+    }
+
+    .fc-event-vert.fc-invitation-needs-action,
+    .fc-event-hori.fc-invitation-needs-action {
+        border: 1px dashed #5757c7 !important;
+    }
+
+    .fc-event-vert.fc-invitation-tentative,
+    .fc-event-hori.fc-invitation-tentative {
+        border: 1px dashed #eb8900 !important;
+    }
+
+    .fc-event-vert.fc-invitation-declined,
+    .fc-event-hori.fc-invitation-declined {
+        border: 1px dashed #c00 !important;
+    }
+
+    .fc-event-vert.fc-event-ns-other.fc-invitation-declined,
+    .fc-event-hori.fc-event-ns-other.fc-invitation-declined {
+        opacity: 0.7;
+    }
+
+    .fc-event-ns-other.fc-invitation-declined .fc-event-title {
+        text-decoration: line-through;
+    }
+
+    .fc-event-vert.fc-invitation-tentative .fc-event-bg {
+        background: url(data:image/gif;base64,R0lGODlhCAAIAPABAOuJAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
+    }
+
+    .fc-event-vert.fc-invitation-needs-action .fc-event-bg {
+        background: url(data:image/gif;base64,R0lGODlhCAAIAPABAFdXx////yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
+    }
+
+    .fc-event-vert.fc-invitation-declined .fc-event-bg {
+        background: url(data:image/gif;base64,R0lGODlhCAAIAPABAMwAAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
+    }
+
+    .fc-view-table tr.fc-invitation-tentative td,
+    .fc-view-table tr.fc-invitation-declined td,
+    .fc-view-table tr.fc-invitation-needs-action td {
+        color: #888;
+    }
+
+    .fc-view-table tr.fc-invitation-tentative td.fc-event-title,
+    .fc-view-table tr.fc-invitation-declined td.fc-event-title,
+    .fc-view-table tr.fc-invitation-needs-action td.fc-event-title {
+        font-weight: normal;
+    }
+
+    .fc-needs-action,
+    .fc-declined,
+    .cal-event-status-cancelled {
+        opacity: 0.6;
+    }
+
+    .fc-icon-alarms,
+    .fc-icon-sensitive,
+    .fc-icon-recurring {
+        display: inline-block;
+        width: 1em;
+        height: 1em;
+        margin-left: .25rem;
+
+        &:before {
+            &:extend(.font-icon-class);
+            font-size: 1em;
+            line-height: 1;
+        }
+    }
+
+    .fc-icon-recurring:before {
+        .font-icon-regular(@fa-var-clone);
+    }
+
+    .fc-icon-alarms:before {
+        content: @fa-var-bell;
+    }
+
+    .fc-icon-sensitive:before {
+        content: @fa-var-lock;
+    }
+
+    .fc-event-temp {
+        opacity: 0.4;
+    }
+
+    .fc-sat, .fc-sun {
+        background-color: @color-calendar-free-bg;
+    }
+
+    // remove redundant borders
+    .fc-first tbody .fc-day-header,
+    .fc-first .fc-day-header.fc-first,
+    .fc-week .fc-first {
+        border-left: 0;
+    }
+
+    .fc-agenda-days tbody .fc-last > *,
+    .fc-agenda-slots tr:last-child td,
+    .fc-week.fc-last .fc-day {
+        border-bottom: 0;
+    }
+}
+
+// Add scrollbar on iOS
+html:matches(.ipad,.iphone) {
+    .ui-dialog-content:not(.iframe),
+    #fish-eye-view,
+    .fc-list-content,
+    .fc-view > div > div {
+        &::-webkit-scrollbar {
+            -webkit-appearance: none;
+        }
+
+        &::-webkit-scrollbar:vertical {
+             width: .6rem;
+        }
+
+        &::-webkit-scrollbar:horizontal {
+            height: .6rem;
+        }
+
+        &::-webkit-scrollbar-thumb {
+            background-color: rgba(0, 0, 0, .4);
+            border-radius: .3rem;
+            border: 2px solid #fff;
+        }
+    }
+}
+
+// fullcalendar style overrides for printing
+.print-content {
+    .fc-header {
+        tr {
+            background-color: #fff;
+        }
+    }
+
+    .fc-header-center {
+        width: 100%;
+        h2 {
+            color: #000;
+            padding-bottom: .75rem;
+            font-size: 1.5rem !important;
+        }
+    }
+
+    .ui-resizable-handle,
+    .fc-agenda-gutter,
+    .fc-header-left,
+    .fc-header-right {
+        display: none !important;
+    }
+
+    .fc-view {
+        overflow: visible;
+    }
+
+    .fc-list-section td,
+    .fc-event {
+        color: black !important;
+    }
+
+    .fc-state-highlight,
+    .fc-event:not(.fc-event-row) .fc-event-skin {
+        background-color: #fff !important;
+    }
+
+    .fc-event-title {
+        font-weight: bold;
+    }
+
+    .fc-event-hori {
+        .fc-event-title {
+            font-weight: normal;
+            white-space: nowrap;
+        }
+
+        .fc-event-time {
+            white-space: nowrap;
+            font-weight: normal !important;
+            font-size: 10px;
+            padding-right: 0.6em;
+        }
+    }
+
+    .fc-grid .fc-event-time {
+        font-weight: normal !important;
+        padding-right: 0.3em;
+    }
+
+    .fc-event-categories {
+        font-style: italic;
+    }
+
+    .fc-event-location {
+        font-size: 100%;
+    }
+
+    .fc-agenda-slots td div {
+        height: 1.4em;
+    }
+
+    .fc-widget-header, .fc-widget-content {
+        border-color: @color-calendar-border;
+    }
+
+    .fc-view-list, .fc-view-table {
+        border: 0;
+    }
+
+    .fc-view-list div.fc-list-header,
+    .fc-view-table td.fc-list-header {
+        padding: 0.3em;
+        background: #fff;
+        font-weight: bold;
+        font-size: 1.2em;
+        color: #333;
+        border-color: @color-calendar-border;
+        border-style: solid;
+        border-width: 1px 0;
+    }
+
+    .fc-list-section .fc-event {
+        cursor: auto;
+    }
+
+    .fc-view-table {
+        tr.fc-event {
+            td,
+            td.fc-event-handle {
+                border-color: @color-calendar-border;
+                padding-top: .5em;
+                padding-bottom: .5em;
+            }
+
+            td.fc-event-handle {
+                padding-top: .8em;
+            }
+
+            .fc-event-description {
+                padding-left: 1.5em;
+                padding-top: 0;
+            }
+        }
+
+        tr.fc-last td {
+            border: 0;
+        }
+
+        col.fc-event-location {
+            width: 20%;
+        }
+    }
+
+    .fc-event-description {
+        white-space: pre-wrap;
+
+        .fc-event-vert & {
+            font-size: 90%;
+            font-style: italic;
+        }
+    }
+
+    .fc-day {
+        font-size: 90%;
+    }
+
+    .fc-view-month .fc-event-hori .fc-event-inner {
+        background: #fff !important;
+    }
+
+    // add back borders removed in non-print view
+    .fc-first .fc-day-header.fc-first,
+    .fc-agenda .fc-agenda-axis,
+    .fc-first .fc-day-header,
+    .fc-week .fc-first {
+        border-left: 1px solid @color-calendar-border;
+    }
+
+    .fc-agenda-days th:nth-last-child(2),
+    .fc-agenda-allday td,
+    .fc-agenda-slots td.fc-widget-content {
+        border-right: 1px solid @color-calendar-border;
+    }
+
+    .fc-agenda-days tr.fc-last > *,
+    .fc-week.fc-last .fc-day {
+        border-bottom: 1px solid @color-calendar-border;
+    }
+}
+
+body.task-calendar {
+    #print-layout {
+        #calendar-view-selector {
+            float: right;
+            padding-top: .25rem;
+        }
+    }
+
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        & > #layout > div.sidebar {
+            flex: 2 !important;
+            max-width: 400px;
+        }
+    }
+
+    // improve datepicker
+    .ui-datepicker {
+        td {
+            width: 12.5%;
+        }
+
+        .ui-datepicker-week-col {
+            color: @color-black-shade-border;
+            text-align: center;
+        }
+    }
+
+    .ui-datepicker-inline {
+        .ui-datepicker-week-col {
+            color: @color-link;
+            cursor: pointer;
+        }
+
+        .ui-datepicker-activerange {
+            background-color: @color-list-selected-background;
+        }
+    }
+}
+
+#timezone-display {
+    font-size: .9rem;
+    color: @color-black-shade-text;
+}
+
+#agendaoptions {
+    padding: 0 .5rem .5rem .5rem;
+    display: flex;
+    background-color: @color-black-shade-bg;
+
+    .input-group {
+        padding-right: .5rem;
+        flex-wrap: nowrap;
+        width: 50%;
+
+        &:last-child {
+            padding-right: 0;
+        }
+    }
+
+    select {
+        min-width: 7em;
+    }
+
+    .input-group-prepend {
+        overflow: hidden;
+        margin-bottom: 0;
+
+        span {
+            display: block;
+            .overflow-ellipsis;
+        }
+    }
+}
+
+#searchcontrols {
+    z-index: 3;
+    position: absolute;
+    top: 7.5rem;
+    right: 0;
+    display: none !important; // FIXME: this is now disabled, do we really need this widget?
+    height: @layout-header-height;
+    overflow: hidden;
+    transform: translateX(80%);
+    transition: transform 0.3s ease-in-out;
+    background-color: fadeout(lighten(@color-main, 15%), 10%);
+    border-radius: .3rem 0 0 .3rem;
+
+    .toolbar {
+        float: right;
+        height: @layout-header-height;
+
+        a.button:before {
+            width: auto;
+            height: 1.75rem;
+            display: block;
+            float: none;
+        }
+    }
+
+    a.button.icon.tools {
+        padding: 0 .25rem;
+        display: inline-block;
+        height: @layout-header-height;
+
+        span.inner {
+            display: none;
+        }
+
+        &:before {
+            line-height: @layout-header-height;
+            margin: 0;
+        }
+    }
+
+    &.open {
+        transform: translateX(0);
+
+        a.button.icon.tools:before {
+            content: @fa-var-chevron-right;
+        }
+    }
+
+    a {
+        color: @color-image-tools;
+
+        &:focus,
+        &:hover {
+            background-color: @color-image-tools-hover !important;
+            outline: 0;
+        }
+    }
+
+    .message {
+        display: none;
+    }
+}
+
+#eventshow {
+    margin: 0;
+
+    .event-title {
+        font-size: 1.5rem;
+        font-weight: bold;
+    }
+
+    .event-location {
+        .overflow-ellipsis;
+        white-space: nowrap;
+    }
+
+    .event-description {
+        margin: 1rem 0;
+    }
+
+    .event-attendees {
+        margin-bottom: 1rem;
+
+        .attendee {
+            margin-right: .25rem;
+        }
+    }
+
+    .event-partstat {
+        & > span {
+            display: flex;
+        }
+
+        .rsvp-status {
+            &:before {
+                display: inline;
+                float: none;
+            }
+        }
+
+        .changersvp {
+            cursor: pointer;
+            font-size: 1.2rem;
+            margin-left: 1em;
+
+            &:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-pen-square;
+                float: none;
+                display: inline;
+                line-height: 1;
+            }
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+}
+
+#eventedit {
+    .edit-attendees-table td {
+        padding-top: .15rem;
+
+        &.role {
+            padding-left: 0;
+            width: 9em;
+        }
+    }
+}
+
+#fish-eye-view {
+    padding: 0;
+
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        border-bottom: 1px solid @color-calendar-border;
+    }
+
+    .fc-header {
+        display: none;
+    }
+
+    .fc-view {
+        position: initial !important;
+    }
+
+    .fc-agenda-days tr.fc-first th {
+        border-top: 0;
+    }
+
+    .fc-agenda-divider + div {
+        height: 100% !important;
+        overflow: initial !important;
+    }
+}
+
+@color-availability-unknown:        #bbb;           // Larry: #ddd;
+@color-availability-free:           @color-success; // Larry: #abd640;
+@color-availability-busy:           @color-error;   // Larry: #e26569;
+@color-availability-tentative:      #8383fc;
+@color-availability-out-of-office:  #fbaa68;
+
+.availability {
+    span {
+        margin-right: .5rem;
+        color: @color-black-shade-text;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-square;
+            display: inline;
+            float: none;
+        }
+
+        &.legend:before {
+            font-size: 1em;
+        }
+
+        &.loading:before {
+            .animated-icon-class;
+            content: @fa-var-circle-notch;
+            display: block;
+            line-height: 1;
+        }
+
+        &.unknown:before {
+            color: @color-availability-unknown;
+        }
+
+        &.free:before {
+            color: @color-availability-free;
+        }
+
+        &.busy:before {
+            color: @color-availability-busy;
+        }
+
+        &.tentative:before {
+            color: @color-availability-tentative;
+        }
+
+        &.out-of-office:before {
+            color: @color-availability-out-of-office;
+        }
+    }
+}
+
+// fixes additional checkbox in Elastic's .datetime widget
+.datetime {
+    label {
+        margin-left: 1em;
+        margin-top: .4rem;
+
+        label {
+            line-height: 1;
+
+            &:before {
+                margin-right: .25rem;
+            }
+        }
+    }
+
+    input {
+        width: 10em !important;
+    }
+
+    input[type=checkbox] {
+        width: auto !important;
+    }
+
+    @media screen and (max-width: 420px) {
+        input {
+            width: 8em !important;
+
+            & + input {
+                width: 6em !important;
+            }
+        }
+    }
+}
+
+.calendar-scheduler {
+    .nav {
+        align-items: center;
+
+        button:first-child {
+            margin-right: .25rem;
+        }
+
+        & > div {
+            white-space: nowrap;
+        }
+
+        @media screen and (max-width: 420px) {
+            button {
+                padding-left: .5rem;
+                padding-right: .5rem;
+            }
+        }
+    }
+
+    .schedule-buttons {
+        .prev-slot:before {
+            content: @fa-var-chevron-left;
+        }
+
+        .next-slot:after {
+            &:extend(.font-icon-class);
+            content: @fa-var-chevron-right;
+            display: inline-block;
+            float: none;
+            margin-right: 0;
+        }
+    }
+
+    .schedule-options {
+        flex: 1;
+        margin-left: 1rem;
+
+        html.layout-phone & {
+            order: 100;
+            margin-left: 0;
+        }
+
+        label {
+            vertical-align: middle;
+        }
+
+        input.icon-checkbox + label:before {
+            margin-right:.25rem;
+            display: inline;
+            float: none;
+        }
+    }
+
+    .schedule-nav {
+        flex: 1;
+        margin-left: .3rem;
+        text-align: right;
+
+        button {
+            line-height: 1.8;
+        }
+    }
+
+    .schedule-range {
+        width: 60%;
+        margin-top: 2rem;
+
+        html.layout-phone & {
+            margin: 0;
+        }
+    }
+
+    .schedule-legend {
+        .attendee {
+            margin-right: .5rem;
+        }
+    }
+
+    .attendees-list {
+        position: relative;
+
+        a.attendee-role-toggle {
+            position: absolute;
+            left: 0;
+            display: inline-block;
+            width: 1em;
+            cursor: pointer;
+        }
+
+        div.attendee {
+            border-top: 1px solid @color-list-border;
+            line-height: 1.7rem;
+            height: 1.8rem;
+        }
+
+        .attendee {
+            white-space: nowrap;
+
+            &.spacer {
+                height: 10px;
+            }
+
+            &.loading:before {
+                .animated-icon-class;
+                .font-icon-solid(@fa-var-circle-notch);
+            }
+
+            &.total {
+                font-weight: bold;
+            }
+
+            &.total,
+            &.spacer {
+                &:before {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    .schedule-table {
+        table-layout: fixed;
+
+        th {
+            border-top: 0;
+        }
+
+        td.attendees {
+            width: 25%;
+            overflow: hidden;
+            border-top: 0;
+
+            html.layout-phone & {
+                width: 35%;
+            }
+
+            .attendees-list {
+                border-bottom: 1px solid @color-table-border;
+            }
+        }
+
+        td.times {
+            width: auto;
+            border-top: 0;
+
+            table {
+                margin: 0;
+            }
+
+            td {
+                height: 1.8rem;
+                border-top: 1px solid @color-list-border;
+                white-space: nowrap;
+            }
+        }
+
+        div.scroll {
+            position: relative;
+            overflow: auto;
+        }
+
+        .timesheader {
+            height: 1.4rem;
+            border-top: 1px solid @color-table-border;
+        }
+
+        .boxtitle {
+            margin: 0;
+            padding: 0;
+            font-size: 1rem;
+            font-weight: bold;
+            padding-top: .5rem;
+            line-height: 2;
+        }
+
+        td {
+            padding: 4px;
+        }
+
+        tbody td {
+            padding: 0;
+
+            div {
+                height: 100%;
+            }
+        }
+
+        tr.spacer td {
+            padding: 0;
+            height: 10px;
+        }
+
+        tr.dates th[colspan="1"] {
+            min-width: 48px;
+            max-width: 48px;
+            text-align: center;
+            font-size: .7rem;
+            line-height: 2.9;
+        }
+
+        tr.times td {
+            cursor: pointer;
+            min-width: 48px;
+            max-width: 48px;
+            font-size: .7rem;
+            text-align: center;
+            color: @color-link;
+            height: 1.4rem;
+            padding: 0 .1rem;
+            vertical-align: middle;
+            border-top: 1px solid @color-table-border;
+            border-left: 1px solid @color-list-border;
+        }
+
+        .fbcontent {
+            td {
+                border-left: 1px solid @color-list-border;
+            }
+
+            &:last-child td {
+                border-bottom: 1px solid @color-table-border;
+            }
+        }
+
+        div.unknown {
+            background-color: @color-availability-unknown;
+        }
+
+        div.free {
+            background-color: @color-availability-free;
+        }
+
+        div.busy {
+            background-color: @color-availability-busy;
+        }
+
+        div.tentative {
+            background-color: @color-availability-tentative;
+        }
+
+        div.out-of-office {
+            background-color: @color-availability-out-of-office;
+        }
+
+        div.all-busy,
+        div.all-tentative,
+        div.all-out-of-office {
+            overflow: hidden;
+
+            // This span imitates a slanting line across the parent element
+            span {
+                display: block;
+                width: 300%;
+                height: 300%;
+                border: 1px solid #fff;
+                background: darken(@color-availability-busy, 10%);
+                transform: rotate(42deg) translate(2%);
+            }
+
+            &.w10 span {
+                display: none;
+            }
+
+            &.w20 span,
+            &.w25 span {
+                transform: rotate(17deg) translate(-9%);
+            }
+
+            &.w30 span {
+                transform: rotate(28deg) translate(-7%);
+            }
+
+            &.w40 span {
+                transform: rotate(36deg) translate(-3%);
+            }
+
+            &.w60 span {
+                transform: rotate(48deg) translate(6%);
+            }
+
+            &.w70 span,
+            &.w75 span {
+                transform: rotate(55deg) translate(12%, 30%);
+            }
+
+            &.w80 span {
+                transform: rotate(56deg) translate(13%, 30%);
+            }
+
+            &.w90 span {
+                transform: rotate(59deg) translate(16%, 30%);
+            }
+
+            &.w100 span {
+                transform: rotate(62deg) translate(19%, 30%);
+            }
+        }
+
+        div.all-tentative span {
+            background: darken(@color-availability-tentative, 10%);
+        }
+
+        div.all-out-of-office span {
+            background: darken(@color-availability-out-of-office, 10%);
+        }
+    }
+}
+
+#schedule-event-time {
+    position: absolute;
+    border-radius: .3rem;
+    cursor: move;
+    border: 2px solid #444;
+    background-color: rgba(0, 0, 0, .3);
+}
+
+.resources-dialog {
+    .resource-selection {
+        flex: 4;
+        min-width: 300px;
+    }
+
+    .resource-content {
+        flex: 10;
+        margin-left: 1em;
+    }
+
+    .listing li.resource > a {
+        color: @color-font;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-cube;
+        }
+    }
+
+    .slot-nav {
+        display: none; // TODO
+    }
+}
+
+#resource-availability {
+    height: 100%;
+
+    .fc {
+        height: 100%;
+        overflow: hidden;
+        position: relative;
+    }
+
+    .fc-content {
+    }
+
+    .fc-view {
+        border-left: 1px solid @color-calendar-border;
+        border-bottom: 1px solid @color-calendar-border;
+    }
+
+    table.fc-header {
+        display: none;
+    }
+}
+
+.standalone-invitebox {
+    margin: 0 auto;
+    max-width: 500px;
+    width: 95%;
+    display: flex;
+    flex-direction: column;
+    top: 15vh;
+    position: relative;
+
+    #logo {
+        max-height: 90px;
+    }
+
+    .invitebox {
+        margin-top: 3em !important;
+    }
+}
+
+.searchbar a.button.date {
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        display: none;
+    }
+
+    &:before {
+        line-height: 1.25;
+    }
+}
+
+@media screen and (max-width: @screen-width-small) {
+    .fc {
+        .fc-header-left {
+            display: block;
+            width: 100%;
+            padding: 0;
+
+            button {
+                flex: 1 1 auto;
+                border-radius: 0;
+            }
+
+            .btn-group {
+                padding: 0;
+                display: flex;
+            }
+        }
+
+        .fc-header-center,
+        .fc-header-right {
+            display: none;
+        }
+
+        .fc-list-content {
+            table,
+            tbody {
+                display: flex;
+                flex-direction: column;
+                padding: 0 !important;
+            }
+        }
+
+        .fc-list-header {
+            td {
+                display: block;
+                text-align: center;
+                color: @color-black-shade-text;
+            }
+        }
+
+        // Use flexbox to reconstruct agenda view on mobile
+        .fc-list-section {
+            tr.fc-event {
+                border: 0;
+                margin: 0;
+                display: flex;
+                flex-wrap: wrap;
+
+                td {
+                    border: 0;
+                }
+
+                .fc-event-handle {
+                    padding: .5rem;
+                }
+
+                .fc-event-time {
+                    flex: 1;
+                    text-align: right;
+                    padding-right: .5rem;
+                }
+
+                .fc-event-title {
+                    .overflow-ellipsis;
+                    white-space: nowrap;
+                    min-width: 100%;
+                    border-bottom: 1px solid @color-list-border;
+                    padding: .1rem .25rem .1rem 1.7rem;
+                }
+
+                .fc-event-location {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    #agendaoptions {
+        padding-top: .5rem;
+    }
+
+    .calendar-scheduler {
+        .schedule-range {
+            width: 100%;
+        }
+    }
+
+    .sidebar .calendar-datepicker {
+        display: none;
+    }
+
+    .resources-dialog {
+        .resource-content {
+            display: none;
+            margin: 0;
+        }
+
+        .resource-content {
+            ul {
+                margin: 1em 1em 0 1em;
+            }
+        }
+    }
+
+    #resource-availability {
+        margin: 0 1em;
+    }
+}
+
+@media screen and (min-width: (@screen-width-small + 1px)) and (max-width: 920px) {
+    .fc {
+        .fc-header {
+            display: block;
+
+            tr {
+                display: flex;
+            }
+        }
+
+        .fc-header-center {
+            .overflow-ellipsis;
+            flex: 1;
+
+            h2 {
+                font-size: 1rem;
+                line-height: 1;
+                padding-top: .75rem;
+            }
+        }
+
+        .fc-header-left,
+        .fc-header-right {
+            width: auto;
+
+            .btn {
+                padding-left: .5rem;
+                padding-right: .5rem;
+            }
+        }
+    }
+}
+
+body.task-calendar .header-title {
+    position: relative;
+
+    .tz {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        line-height: 2;
+        font-size: .8rem;
+        font-weight: normal;
+        color: @color-black-shade-text;
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/kolab_activesync.less b/plugins/libkolab/skins/elastic/include/kolab_activesync.less
new file mode 100644
index 00000000..95700df9
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/kolab_activesync.less
@@ -0,0 +1,53 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_activesync plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.listing.iconized li {
+    &.activesync > a:before {
+        content: @fa-var-rss-square;
+    }
+}
+
+#devices-table {
+    td:not(.selection) {
+        display: flex;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-rss-square; // TODO: mobile icon is not free
+        }
+
+        span {
+            .overflow-ellipsis;
+        }
+    }
+
+    .devicealias {
+        flex: 1;
+    }
+
+    .devicetype {
+        max-width: 40%;
+        font-style: italic;
+        padding-left: .5em;
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/kolab_delegation.less b/plugins/libkolab/skins/elastic/include/kolab_delegation.less
new file mode 100644
index 00000000..892d7bd1
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/kolab_delegation.less
@@ -0,0 +1,35 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_delegation plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.listing.iconized li {
+    &.delegation > a:before {
+        content: @fa-var-user-secret; // TODO: a better icon
+    }
+}
+
+#delegate-table {
+    td:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-user-secret; // TODO: a better icon
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/kolab_files.less b/plugins/libkolab/skins/elastic/include/kolab_files.less
new file mode 100644
index 00000000..34b89205
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/kolab_files.less
@@ -0,0 +1,521 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_files plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+a.btn.fromcloud:before,
+li > a.icon.saveas:before,
+a.button.filesaveall:before,
+a.button.saveas:before {
+    &:extend(.font-icon-class);
+    content: @fa-var-folder;
+}
+
+.toolbarmenu.listing li a.mount.storage:before {
+    content: @fa-var-database;
+}
+
+.toolbar a.button.open:before {
+    content: @fa-var-eye;
+}
+
+.toolbar a.button.rename:before {
+    content: @fa-var-pen-square;
+}
+
+.toolbar a.button.cancel:before {
+    content: @fa-var-times;
+}
+
+.listing li a.share:before {
+    content: @fa-var-share-alt;
+}
+
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset a.btn-link.options.add-folder {
+    order: -1;
+
+    &:before {
+        content: @fa-var-plus;
+    }
+}
+
+.folderlist {
+    li.collection {
+        a.name {
+            padding-left: .5em;
+        }
+
+        &.audio a.name:before {
+            .font-icon-solid(@fa-var-volume-up);
+        }
+
+        &.video a.name:before {
+            .font-icon-solid(@fa-var-video);
+        }
+
+        &.image a.name:before {
+            content: @fa-var-image;
+        }
+
+        &.document a.name:before {
+            .font-icon-solid(@fa-var-book);
+        }
+
+        &.sessions a.name:before {
+            .font-icon-solid(@fa-var-users);
+        }
+    }
+
+    li.mailbox {
+        a.subscription {
+            cursor: pointer;
+            // reset listing's link style
+            padding: 0;
+            border-left: 0;
+            width: auto;
+
+            &:before {
+                .font-icon-regular(@fa-var-bookmark); // TODO: better icon
+                height: auto;
+                color: @color-link;
+                margin-right: .25rem;
+            }
+
+            &.subscribed:before {
+                &:extend(.font-icon-class);
+                .font-icon-solid(@fa-var-bookmark); // TODO: better icon
+            }
+        }
+    }
+}
+
+#filelistcontainer {
+    position: relative;
+}
+
+#filelistbox {
+    height: 100%;
+
+    &.droptarget {
+        &.active {
+            box-shadow: 0 0 2px 1px darken(@color-toolbar-button-background-hover, 20%) inset;
+        }
+
+        &.hover {
+            box-shadow: 0 0 2px 1px darken(@color-toolbar-button-background-hover, 20%) inset;
+            background-color: @color-toolbar-button-background-hover;
+        }
+    }
+}
+
+.filelist {
+    thead {
+        display: none;
+    }
+
+    td.options {
+        display: none;
+    }
+
+    td.name {
+        position: relative;
+    }
+
+    td.mtime {
+        width: 11em;
+    }
+
+    td.size {
+        text-align: right;
+        width: 6em;
+    }
+
+    tr.session > td.name {
+        padding-right: 2em;
+
+        &:after {
+            &:extend(.font-icon-class);
+            content: @fa-var-users;
+            color: @color-black-shade-border;
+            position: absolute;
+            right: .25em;
+            top: 0;
+        }
+    }
+
+    tr.session.invited > td.name:after {
+        color: @color-success;
+    }
+
+    tr.session.owner > td.name:after {
+        color: @color-black;
+    }
+}
+
+@media screen and (max-width: @screen-width-xs) {
+    .filelist {
+        td.mtime {
+            display: none;
+        }
+    }
+}
+
+.filelist tbody td.filename {
+    & span {
+        background: transparent !important;
+    }
+
+    & span:before {
+        &:extend(.font-icon-class);
+        .font-icon-regular(@fa-var-file);
+    }
+
+    &.pdf span:before,
+    &.application_pdf span:before {
+        content: @fa-var-file-pdf;
+    }
+
+    &.application_vnd_openxmlformats_officedocument_wordprocessingml_document span:before,
+    &.application_vnd_openxmlformats_officedocument_wordprocessingml_template span:before,
+    &.application_vnd_ms_word span:before,
+    &.application_msword span:before {
+        content: @fa-var-file-word;
+    }
+
+    &.application_vnd_ms_excel span:before,
+    &.application_vnd_openxmlformats_officedocument_spreadsheetml_sheet span:before,
+    &.application_vnd_openxmlformats_officedocument_spreadsheetml_template span:before,
+    &.application_vnd_oasis_opendocument_spreadsheet span:before,
+    &.application_vnd_oasis_opendocument_spreadsheet_template span:before {
+        content: @fa-var-file-excel;
+    }
+
+    &.application_vnd_openxmlformats_officedocument_presentationml_presentation span:before,
+    &.application_vnd_openxmlformats_officedocument_presentationml_template span:before,
+    &.application_vnd_openxmlformats_officedocument_presentationml_slideshow span:before,
+    &.application_vnd_ms_powerpoint span:before {
+        content: @fa-var-file-powerpoint;
+    }
+
+    &.application_vnd_oasis_opendocument_text span:before {
+        content: @fa-var-file-alt; // TODO
+    }
+
+    &.application_vnd_oasis_opendocument_presentation span:before,
+    &.application_vnd_oasis_opendocument_presentation_template span:before {
+        content: @fa-var-file-powerpoint; // TODO
+    }
+
+    &.tar span:before,
+    &.application_zip span:before,
+    &.application_x_7z_compressed span:before,
+    &.application_x_ace span:before,
+    &.application_x_arc span:before,
+    &.application_x_arj span:before,
+    &.application_x_bzip_compressed_tar span:before,
+    &.application_x_lha span:before,
+    &.application_x_rar span:before,
+    &.application_x_tarz span:before,
+    &.application_x_tzo span:before,
+    &.application_x_zip span:before,
+    &.application_x_zoo span:before {
+        content: @fa-var-file-archive;
+    }
+
+    &.image span:before,
+    &.image_png span:before,
+    &.image_svg_xml span:before,
+    &.image_jpeg span:before,
+    &.image_jpeg2000 span:before,
+    &.image_x_eps span:before,
+    &.application_vnd_stardivision_draw span:before,
+    &.application_vnd_sun_xml_draw span:before,
+    &.application_vnd_sun_xml_draw_template span:before {
+        content: @fa-var-file-image;
+    }
+
+    &.application_pgp_keys span:before,
+    &.application_pkcs7_mime span:before {
+        // TODO
+    }
+
+    &.audio span:before {
+        content: @fa-var-file-audio;
+    }
+
+    &.video span:before {
+        content: @fa-var-file-video;
+    }
+
+    &.ascii span:before,
+    &.text_plain span:before {
+        content: @fa-var-file-alt;
+    }
+
+    &.vcalendar span:before {
+        // TODO
+    }
+
+    &.vcard span:before,
+    &.text_x_vcard span:before {
+        // TODO
+    }
+
+    &.text_html span:before {
+        content: @fa-var-file-code;
+    }
+
+    &.style_css span:before {
+        // TODO
+    }
+
+    &.text_csv span:before {
+        // TODO
+    }
+
+    &.message_rfc822 span:before {
+        // TODO
+    }
+}
+
+#folder-mount-form {
+    td.source {
+        display: flex;
+        align-items: flex-start;
+        padding: .5rem;
+
+        &.selected {
+            background-color: @color-list-selected-background;
+        }
+
+        & > input {
+            height: 32px;
+            margin-right: .5rem;
+        }
+
+        & > div {
+            flex: 1;
+        }
+
+        img {
+            height: 32px;
+            margin-right: .5rem;
+        }
+
+        .name {
+            font-weight: bold;
+        }
+
+        .description {
+            font-size: 90%;
+        }
+
+        table {
+            margin-top: .5rem;
+        }
+
+        .form-group {
+            margin-bottom: 0;
+        }
+    }
+
+    .auth-options {
+        margin-top: .5rem;
+
+        & > label:before {
+            line-height: 1;
+        }
+    }
+}
+
+.files-dialog {
+    .selection-list {
+        flex: 1;
+        min-width: 220px;
+    }
+
+    .selection-content {
+        flex: 2;
+
+        @media screen and (min-width: (@screen-width-small + 1px)) {
+            border: 1px solid @color-layout-border;
+            border-left: 0;
+        }
+    }
+
+    a.subscription {
+        display: none;
+    }
+
+    @media screen and (max-width: @screen-width-small) {
+        .selection-list {
+            display: none;
+        }
+    }
+}
+
+.document-editor-header {
+    .toolbar {
+        text-align: left !important;
+    }
+
+    .header-title {
+        margin: 0 !important;
+    }
+
+    a.button.icon.members:before {
+        content: @fa-var-users;
+    }
+
+    #collaborators {
+        order: 9;
+        display: flex;
+        margin-right: .5rem;
+        margin-left: 2rem;
+
+        a.button.add:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-plus;
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+
+    #doc-title {
+        flex: 1;
+        order: 8;
+
+        input {
+            display: inline;
+        }
+    }
+}
+
+.session-members {
+    img.photo {
+        width: 48px;
+        height: 48px;
+        min-width: 48px;
+        overflow: hidden;
+        background: url("@{skin-path}/images/contactpic.png") center center no-repeat #fff;
+        background-size: cover;
+        border-radius: 50%;
+        border: solid 3px #eee;
+        margin-left: .5rem;
+    }
+
+    ul {
+        padding: 0;
+        margin: 0;
+        list-style-type: none;
+
+        li {
+            display: flex;
+            align-items: center;
+        }
+
+        img.photo {
+            margin-left: 0;
+            margin-right: 1em;
+        }
+    }
+}
+
+.editors-dialog {
+    table {
+        th {
+            border: 0;
+        }
+
+        tr:last-child td {
+            border-bottom: 1px solid @color-layout-border;
+        }
+
+        td.options {
+            width: 1%;
+
+            a.delete:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-trash-alt;
+                display: inline;
+                line-height: 1;
+            }
+        }
+    }
+
+    label {
+        display: block;
+    }
+}
+
+button.participant.add:before {
+    content: @fa-var-user-plus;
+}
+
+.iframe-wrapper.file-type-audio,
+.iframe-wrapper.file-type-video {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        padding: 1em;
+    }
+}
+
+#shareform {
+    table {
+        td,th {
+            padding-left: .15rem;
+            max-width: 10vw; // needed for overflow
+            .overflow-ellipsis;
+
+            &:last-child {
+                padding-right: .15rem;
+                width: 1%;
+                max-width: unset;
+            }
+        }
+
+        td {
+            vertical-align: middle;
+
+            &.form {
+                input {
+                    margin-bottom: .25rem;
+                    width: 100%;
+                }
+            }
+        }
+
+        tr + tr > td {
+            border-top: 0;
+            padding-bottom: .25rem;
+        }
+
+        button {
+            padding: .185rem .75rem;
+            width: 100%;
+        }
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/kolab_notes.less b/plugins/libkolab/skins/elastic/include/kolab_notes.less
new file mode 100644
index 00000000..7f09a93c
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/kolab_notes.less
@@ -0,0 +1,97 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_notes plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.toolbarmenu.listing li {
+    a.appendnote:before {
+        .font-icon-regular(@fa-var-sticky-note);
+    }
+}
+
+// Fixes TinyMCE editor height=0 issue
+#noteform iframe {
+    min-height: 10rem;
+}
+
+#notereferences {
+    margin-top: .5rem;
+
+    .attachmentslist a.delete {
+        margin-left: .5rem;
+    }
+}
+
+#notedetailstitle {
+    .dates {
+        color: @color-list-secondary;
+    }
+}
+
+#print-layout {
+    #notetitle {
+        font-size: 1.5rem;
+        line-height: 2;
+    }
+
+    #notetags {
+        margin-bottom: .5rem;
+    }
+
+    #notecreated {
+        margin-right: 2rem;
+    }
+}
+
+#kolabnoteslist {
+    tr {
+        display: flex;
+    }
+
+    td.title {
+        .overflow-ellipsis;
+        flex: 1;
+
+        &:before {
+            &:extend(.font-icon-class);
+            .font-icon-regular(@fa-var-sticky-note);
+        }
+    }
+
+    td.date {
+        overflow: unset;
+        color: @color-list-secondary;
+        font-style: italic;
+    }
+}
+
+.kolabmessagenotes {
+    & > i.icon:before {
+        .font-icon-regular(@fa-var-sticky-note) !important;
+    }
+
+    & > a {
+        .overflow-ellipsis;
+        white-space: nowrap;
+        display: block;
+        text-decoration: none;
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/kolab_tags.less b/plugins/libkolab/skins/elastic/include/kolab_tags.less
new file mode 100644
index 00000000..26b8c8bb
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/kolab_tags.less
@@ -0,0 +1,122 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin style of kolab_tags plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.toolbarmenu.listing li {
+    a.tags:before {
+        content: @fa-var-tags;
+    }
+
+    a.tag:before,
+    a.tag.remove:before,
+    a.tag.remove.all:before {
+        content: @fa-var-tag;
+    }
+}
+
+#taglist {
+    li {
+        padding: 0 .5rem;
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-tag;
+            margin: 0 .5rem 0 .2rem;
+        }
+    }
+}
+
+#tagsform option:before,
+#taglist li:before,
+#tag-selector li a:before {
+    color: darken(@color-main, 15%); // default tag color
+}
+
+#tagsform option:checked:before,
+#tag-selector li:hover a:before {
+    color: #fff;
+}
+
+#tagsform {
+    min-height: 15rem;
+
+    select {
+        padding: 0;
+        margin-bottom: .5rem;
+
+        &:focus {
+            box-shadow: none !important;
+            border: 1px solid @color-layout-border;
+        }
+    }
+
+    option {
+        color: @color-font; // fix Firefox issue caused by text-shadow below
+        text-shadow: none;
+        padding: .5rem;
+        outline: 0;
+        border: 0;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-tag;
+            line-height: 1;
+        }
+    }
+
+    .buttons {
+        text-align: center;
+
+        button {
+            margin: 0 .25rem;
+        }
+    }
+}
+
+.tagbox {
+    color: #fff;
+    background-color: @color-main !important;
+    border: 0 !important;
+    border-radius: .25rem;
+    max-width: 4em;
+    padding: .1rem .4rem;
+    margin-right: .2rem;
+    font-weight: bold;
+
+    &:not(.tagedit-listelement) a {
+        color: inherit;
+        padding-left: .5rem;
+        text-decoration: none;
+    }
+
+    h2 > & {
+        font-size: 1.2rem;
+    }
+}
+
+.tag-droppable.formcontainer {
+    &.ui-droppable-active {
+        background-color: @color-black-shade-bg !important;
+    }
+    &.ui-droppable-hover {
+        background-color: @color-list-droptarget-background !important;
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/libcalendaring.less b/plugins/libkolab/skins/elastic/include/libcalendaring.less
new file mode 100644
index 00000000..6e5d5b5c
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/libcalendaring.less
@@ -0,0 +1,726 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for libcalendaring plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.invitebox {
+    & > i.icon {
+        position: absolute;
+        top: 0;
+        padding-top: .5em;
+    }
+
+    & > span {
+        padding-left: 2.5em;
+    }
+
+    td {
+        padding: 2px;
+        vertical-align: top;
+
+        &.ititle {
+            font-weight: bold;
+            padding-right: 0.5em;
+        }
+
+        &.label {
+            color: #666;
+            padding-right: 1em;
+        }
+
+        &.sensitivity {
+            font-weight: bold;
+        }
+
+        &.recurrence-id {
+            text-transform: uppercase;
+            font-style: italic;
+        }
+
+        &.date.modified {
+            font-weight: bold;
+            color: @color-error;
+        }
+
+        em {
+            font-weight: bold;
+        }
+    }
+
+    .itip-buttons {
+        display: flex;
+        flex-wrap: wrap;
+
+        input.button {
+            margin: 0 .25rem .25rem 0;
+        }
+    }
+
+    .rsvp-buttons {
+        width: 100%;
+        padding-top: .25rem;
+    }
+
+    .itip-reply-controls {
+        margin-top: .25rem;
+        width: 100%;
+
+        & > label {
+            display: inline;
+
+            label {
+                line-height: 1;
+                margin-right: .25rem;
+            }
+        }
+
+        a {
+            margin-left: 1em;
+            white-space: nowrap;
+        }
+    }
+
+    .rsvp-status {
+        margin: .5rem 0;
+        width: 100%;
+
+        &.hint {
+            color: #666;
+            font-style: italic;
+        }
+    }
+
+    .folder-select {
+        white-space: nowrap;
+
+        select {
+            display: initial;
+            width: auto;
+        }
+    }
+}
+
+.rsvp-status {
+    &:before {
+        line-height: 1.1;
+        color: lighten(@color-black, 25%);
+        float: none;
+        display: inline;
+    }
+
+    &.loading:before {
+        &:extend(.font-icon-class);
+        .animated-icon-class;
+        content: @fa-var-circle-notch;
+        line-height: 1;
+    }
+
+    &.declined:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-ban;
+        color: @color-error;
+    }
+
+    &.tentative:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-check-circle;
+        color: @color-warning;
+    }
+
+    &.accepted:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-check-circle;
+        color: @color-success;
+    }
+
+    &.delegated:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-share;
+    }
+
+    &.needs-action:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-question-circle;
+    }
+}
+
+.attendee {
+    &:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-question-circle;
+        display: inline;
+        float: none;
+        font-size: 1em;
+        color: @color-black-shade-text;
+    }
+
+    &.req-participant:before {
+        content: @fa-var-user;
+    }
+
+    &.opt-participant:before {
+        .font-icon-regular(@fa-var-user);
+    }
+
+    &.non-participant:before {
+        content: @fa-var-user;
+        color: #ccc;
+    }
+
+    &.chair:before {
+        content: @fa-var-user; // todo
+        color: @color-warning;
+    }
+
+    &.completed:before,
+    &.accepted:before {
+        content: @fa-var-check-circle;
+        color: @color-success;
+    }
+
+    &.declined:before {
+        content: @fa-var-ban;
+        color: @color-error;
+    }
+
+    &.tentative:before {
+        content: @fa-var-check-circle;
+        color: @color-warning;
+    }
+
+    &.delegated:before {
+        content: @fa-var-share;
+    }
+
+    &.organizer:before {
+        content: @fa-var-briefcase; // TODO: better icon
+    }
+
+    &.in-process:before {
+        content: @fa-var-cog;
+    }
+}
+
+.attendees-comentbox {
+    label {
+        display: inline;
+    }
+}
+
+.edit-attendees-table {
+    width: 100%;
+
+    th, td {
+        width: 1%;
+        text-align: center;
+    }
+
+    td {
+        border: 0;
+        padding: 0 .3rem;
+    }
+
+    th {
+        border-bottom: 1px solid #eee !important;
+    }
+
+    th.name, td.name, th.role, td.role {
+        width: auto;
+        text-align: left;
+    }
+
+    th.invite {
+        input {
+            display: none;
+        }
+
+        label {
+            cursor: pointer;
+        }
+
+        label:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-envelope;
+            display: inline;
+            float: none;
+            margin-left: .25rem;
+        }
+
+    }
+    td.invite {
+        label:before {
+            line-height: 1.6;
+            height: 1.5em;
+        }
+    }
+
+    td.name {
+        span {
+            line-height: 2.5;
+            display: flex;
+
+            & > :first-child {
+                .overflow-ellipsis;
+                // width and flex is required to make overflow working
+                flex: 1;
+                width: 1px;
+                white-space: nowrap;
+            }
+        }
+    }
+
+    td.availability,
+    td.confirmstate {
+        span {
+            margin: 0;
+        }
+
+        span:after,
+        span:before {
+            line-height: 2;
+            margin: 0;
+            font-size: 1.2em;
+            height: 2em;
+            width: 2em;
+        }
+    }
+
+    td.options {
+        a {
+            display: inline-block;
+            height: 2em;
+
+            &:before {
+                line-height: 1.8;
+                margin: 0;
+            }
+        }
+    }
+
+    a.expandlink {
+        &:before {
+            content: @fa-var-plus-square;
+            line-height: 2;
+        }
+    }
+
+    .inner {
+        display: none;
+    }
+
+    html.layout-phone & {
+        th.availability,
+        th.confirmstate {
+            text-indent: -5000px;
+        }
+
+        td.role {
+            max-width: 7em;
+        }
+
+        select {
+            padding: 0 .5rem;
+        }
+
+    }
+}
+
+html.touch {
+    .edit-attendees-table {
+        td.invite {
+            label:before {
+                line-height: 1.2;
+                height: 1.2em;
+            }
+        }
+    }
+}
+
+.form-searchbar {
+    display: flex;
+    margin-bottom: .5rem;
+
+    input[type=text] {
+        flex: 1;
+
+        html.layout-phone & {
+            max-width: 50%;
+        }
+    }
+
+    input[type=button] {
+        margin-left: .5em;
+        .overflow-ellipsis;
+    }
+}
+
+.attachmentslist li.link {
+    &.message.eml:before {
+        content: @fa-var-envelope;
+    }
+
+    a.messagelink {
+        .overflow-ellipsis;
+        margin-right: .25rem;
+    }
+
+    a.delete .inner {
+        display: none;
+    }
+}
+
+.attachmentslist li.ics:before,
+.attachmentslist li.text.calendar:before,
+.messagelist tbody .attachment span.ical:before {
+    .font-icon-regular(@fa-var-calendar-alt);
+}
+
+.alarms-input {
+    .edit-alarm-item {
+        display: flex;
+
+        & + .edit-alarm-item {
+            margin-top: .25rem;
+        }
+    }
+
+    .edit-alarm-buttons {
+        a {
+            line-height: 1;
+            padding: .375em .25em;
+            margin: 0 .25rem;
+
+            &:before {
+                margin: 0;
+                width: 1em;
+            }
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+
+    .edit-alarm-item.first .delete-alarm {
+        display: none;
+    }
+
+    .edit-alarm-item:not(.first) .add-alarm {
+        display: none;
+    }
+
+    .edit-alarm-type {
+        flex: 1;
+    }
+
+    .edit-alarm-set {
+        display: flex;
+        flex: 1;
+    }
+
+    .edit-alarm-values {
+        margin-left: .25rem;
+        flex: 5;
+    }
+
+    .edit-alarm-offset {
+        flex: 5;
+    }
+
+    .edit-alarm-date,
+    .edit-alarm-time,
+    .edit-alarm-related {
+        flex: 3;
+    }
+}
+
+.recurrence-form {
+    .recurrence-rdates {
+        width: 100%;
+        padding: 0;
+        list-style-type: none;
+
+        &:empty {
+            margin: 0;
+        }
+
+        a.delete {
+            margin-left: 2em;
+            &:before {
+                display: inline-block;
+                float: none;
+            }
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+
+    .recurrence-onevery {
+        select {
+            width: 40%;
+            display: inline;
+        }
+    }
+
+    .inputform {
+        display: flex;
+
+        input.button {
+            margin-left: .25rem;
+        }
+    }
+
+    div.line {
+        width: 100%;
+        display: flex;
+        margin-bottom: .25rem;
+
+        label {
+            margin-left: .5em;
+            min-width: 4em;
+            line-height: 2.5;
+        }
+    }
+
+    .month,
+    .monthday,
+    .weekday {
+        display: inline-block;
+        width: 3.5em;
+        margin-right: .5rem;
+        white-space: nowrap;
+
+        input {
+            margin-right: .25rem;
+        }
+    }
+
+    .monthday {
+        width: 2.75em;
+    }
+
+    .table td {
+        border: 0;
+        padding: 0;
+
+        &.label {
+            white-space: nowrap;
+        }
+
+        &:first-child label {
+            line-height: 2.5;
+        }
+
+        & label.monthday:first-child {
+            margin-top: .5rem;
+        }
+    }
+
+    .input-group-append,
+    .input-group-prepend {
+        display: initial; // fixes buggy height of the element
+    }
+}
+
+#event-status-badge {
+    width: 7rem;
+    height: 7rem;
+    position: absolute;
+    top: 0;
+    right: 0;
+    overflow: hidden;
+
+    span {
+        display: none;
+        text-transform: uppercase;
+        line-height: 20px;
+        position: absolute;
+        left: -2.4rem;
+        top: 2.4rem;
+        width: 13.2rem;
+        text-align: center;
+        font-weight: bold;
+        font-size: .85rem;
+        color: #fff;
+        -webkit-transform: rotate(45deg);
+        transform: rotate(45deg);
+
+        &:before {
+            &:extend(.font-icon-class);
+            display: inline;
+            float: none;
+        }
+
+        .status-cancelled & {
+            background-color: darken(@color-error, 10%);
+            display: block;
+
+            &:before {
+                content: @fa-var-times-circle;
+            }
+        }
+
+        .sensitivity-private & {
+            background-color: darken(@color-warning, 10%);
+            display: block;
+
+            &:before {
+                content: @fa-var-lock;
+            }
+        }
+
+        .sensitivity-confidential & {
+            background-color: darken(@color-error, 10%);
+            display: block;
+
+            &:before {
+                content: @fa-var-user-secret;
+            }
+        }
+    }
+}
+
+#alarm-display {
+    h3 {
+        font-size: 1.2rem;
+        margin-bottom: .25rem;
+
+        &:before {
+            &:extend(.font-icon-class);
+            .font-icon-regular(@fa-var-calendar-alt);
+            font-size: 1em;
+        }
+
+        &.type-task:before {
+            .font-icon-regular(@fa-var-calendar-check);
+        }
+    }
+
+    .event-section {
+        font-size: .9rem;
+        color: @color-black-shade-text;
+        white-space: nowrap;
+        .overflow-ellipsis;
+    }
+
+    .alarm-actions {
+        text-align: right;
+        margin-bottom: .25rem;
+
+        a {
+            &:first-child {
+                margin-right: 1em;
+            }
+
+            &:before {
+                &:extend(.font-icon-class);
+                display: inline;
+                float: none;
+            }
+        }
+    }
+
+    a.alarm-action-snooze:before {
+        content: @fa-var-bell-slash;
+    }
+
+    a.alarm-action-dismiss:before {
+        content: @fa-var-trash-alt;
+    }
+}
+
+#alarm-snooze-dropdown a:before {
+    .font-icon-regular(@fa-var-clock);
+}
+
+.dialog-message {
+    margin: 0;
+    opacity: .95;
+    width: 100%;
+    padding: .75em;
+    margin-top: .25em;
+    color: @color-message;
+    background-color: @color-message-warning-box-background;
+
+    & > label {
+        margin: 0;
+        display: block;
+
+        label:before {
+            line-height: 1.25;
+            margin-right: .25rem;
+        }
+    }
+
+    .message {
+        display: flex;
+    }
+
+    & + .savemode {
+        margin-top: 1rem;
+
+        a.btn {
+            margin-right: .5rem;
+        }
+    }
+
+    & > .savemode {
+        margin-top: .5rem;
+
+        label {
+            margin-right: 1rem;
+        }
+
+        input {
+            margin-right: .25rem;
+        }
+    }
+}
+
+@media screen and (max-width: 420px) {
+    .nav-link.nav-icon {
+        width: 3em;
+        margin-right: 5px;
+        padding: .5rem .5rem .5rem .65rem;
+
+        &:before {
+            .font-icon-class;
+            margin: 0 1rem 0 0;
+            width: 1em;
+            line-height: 1.2;
+        }
+
+        &.resources:before {
+            content: @fa-var-cube;
+            margin-left: .1rem;
+        }
+
+        &.attachments:before {
+            content: @fa-var-paperclip;
+        }
+
+        &.attendees:before {
+            content: @fa-var-users;
+        }
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/tasklist.less b/plugins/libkolab/skins/elastic/include/tasklist.less
new file mode 100644
index 00000000..781bd248
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/include/tasklist.less
@@ -0,0 +1,367 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for tasklist plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#taskmenu a.tasklist:before {
+    content: @fa-var-calendar-check;
+}
+
+.toolbarmenu.listing li {
+    a.tasklistlink:before,
+    a.taskaddlink:before {
+        .font-icon-regular(@fa-var-calendar-check);
+    }
+}
+
+.tasklist-invitebox {
+    & > i.icon:before {
+        content: @fa-var-calendar-check !important;
+    }
+}
+
+.listing {
+    li {
+        & > div {
+            &.tasklist .listname:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-calendar-check;
+            }
+        }
+    }
+}
+
+@tasklist-record-height: 3.8rem;
+
+#tasklist {
+    li.taskitem {
+        border-bottom: 0;
+
+        div.taskhead {
+            position: relative;
+            display: block;
+            height: @tasklist-record-height;
+            padding-left: (1 * @listing-treetoggle-width);
+            outline: 0;
+
+            &.flagged {
+                color: @color-list-flagged !important;
+            }
+
+            &.selected {
+                background-color: @color-list-selected-background;
+            }
+
+            &.droptarget {
+                background-color: @color-list-droptarget-background;
+            }
+        }
+
+        & > div,
+        & > span {
+            border-bottom: 1px solid @color-list-border;
+        }
+
+        ul {
+            padding: 0;
+            border: 0;
+
+            li {
+                padding-left: 0;
+                .taskhead, .title { padding-left: (2 * @listing-treetoggle-width + .25rem); }
+                .childtoggle { left: @listing-treetoggle-width; }
+
+                li {
+                    .taskhead, .title { padding-left: (3 * @listing-treetoggle-width + .25rem); }
+                    .childtoggle { left: (2 * @listing-treetoggle-width); }
+
+                    li {
+                        .taskhead, .title { padding-left: (4 * @listing-treetoggle-width + .25rem); }
+                        .childtoggle { left: (3 * @listing-treetoggle-width); }
+
+                        li {
+                            .taskhead, .title { padding-left: (5 * @listing-treetoggle-width + .25rem); }
+                            .childtoggle { left: (4 * @listing-treetoggle-width); }
+
+                            li {
+                                .taskhead, .title { padding-left: (6 * @listing-treetoggle-width + .25rem); }
+                                .childtoggle { left: (5 * @listing-treetoggle-width); }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .childtoggle {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: @listing-treetoggle-width;
+        padding: 0 0 0 .25rem;
+        height: @tasklist-record-height;
+        cursor: pointer;
+        z-index: 1;
+
+        .inner {
+            display: none;
+        }
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-angle-right;
+            margin: 0;
+            width: 1em;
+            line-height: @tasklist-record-height;
+        }
+
+        &.expanded:before {
+            content: @fa-var-angle-down;
+        }
+
+        &.collapsed:before {
+            content: @fa-var-angle-right;
+        }
+
+        &.complete {
+            span.title {
+                text-decoration: line-through;
+            }
+
+            .progressbar {
+                display: none;
+            }
+        }
+    }
+
+    span.title {
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        line-height: 2em;
+        padding: 0 0 0 .2em;
+        padding-left: (1 * @listing-treetoggle-width + .25rem);
+        margin-right: 2em;
+        .overflow-ellipsis;
+    }
+
+    span.tags {
+        position: absolute;
+        right: 2em;
+        top: 0;
+        line-height: 2em;
+        text-align: right;
+    }
+
+    span.date {
+        position: absolute;
+        padding-left: .2em;
+        font-size: 90%;
+        line-height: 2.5;
+        color: @color-list-secondary;
+        cursor: pointer;
+
+        input {
+            line-height: 1;
+            padding: 0;
+            margin-top: -2px;
+        }
+    }
+
+    span.flagged {
+        position: absolute;
+        right: 0;
+        top: 0;
+        line-height: 1.8em;
+        cursor: pointer;
+    }
+
+    .taskhead:not(.flagged):hover span.flagged:before {
+        &:extend(.font-icon-class);
+        .font-icon-regular(@fa-var-flag);
+    }
+
+    .taskhead.flagged span.flagged:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-flag;
+    }
+
+    .progressbar {
+        position: absolute;
+        bottom: 1px;
+        left: .2em;
+        right: .2em;
+
+        .progressvalue {
+            border-top: 2px solid @color-warning;
+        }
+    }
+
+    input + label,
+    input.complete {
+        position: absolute;
+        right: .25rem;
+        bottom: 0;
+        top: auto;
+        padding: 0 .2em 0 0;
+        cursor: pointer;
+        z-index: 1;
+        line-height: 1;
+        height: 1.5em;
+        font-size: 1.15em;
+    }
+
+    .actions {
+        display: none;
+    }
+
+    // Focus indicator
+    @media screen and (min-width: @screen-width-large) {
+        .taskhead {
+            border-left: 2px solid transparent;
+        }
+
+        .taskhead.focused {
+            border-left: 2px solid @color-list-focus-indicator;
+            outline: 0;
+        }
+    }
+}
+
+html.touch #tasklist {
+    li {
+        font-size: 1rem;
+    }
+
+    span.flagged,
+    input[type=checkbox],
+    .icon-checkbox + label {
+        display: none;
+    }
+
+    span.title {
+        margin-right: .5rem;
+    }
+
+    span.tags {
+        right: .5rem;
+    }
+}
+
+#taskshow {
+    & + .formbuttons {
+        button.disabled {
+            display: none;
+        }
+    }
+
+    .task-parent-title {
+        color: @color-black-shade-text;
+        font-size: 90%;
+        margin-bottom: .5rem;
+    }
+
+    .task-title {
+        font-size: 1.5rem;
+        font-weight: bold;
+    }
+
+    .task-description {
+        margin: 1rem 0;
+    }
+
+    &.status-completed h2 {
+        text-decoration: line-through;
+    }
+
+    &.status-flagged h2:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-flag;
+        color: @color-error;
+        font-size: .9em;
+    }
+
+    .attachmentslist li {
+        margin-right: 1em;
+    }
+}
+
+#taskedit-attachment-form {
+    // fixes redundant scrolling and height issue on task edit form
+    position: absolute;
+}
+
+.messagetasklinks {
+    & > i.icon:before {
+        content: @fa-var-calendar-check !important;
+    }
+
+    .tasklist {
+        list-style-type: none;
+        margin: 0;
+        padding: 0;
+    }
+
+    input {
+        height: auto !important;
+    }
+}
+
+#print-layout {
+    #tasklist {
+        padding: 0;
+
+        li {
+            list-style-type: none;
+        }
+
+        .description {
+            display: block;
+            white-space: pre-wrap;
+        }
+
+        .title {
+            position: relative;
+            font-weight: bold;
+            padding: 0;
+            margin: 0;
+        }
+
+        .taskhead {
+            height: auto;
+        }
+    }
+}
+
+.taskitem-draghelper {
+    .overflow-ellipsis;
+}
+
+.quickview-active {
+    // TODO ?
+}
+
+#rootdroppable {
+    // TODO ?
+}
+
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
new file mode 100644
index 00000000..a32e64b5
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -0,0 +1,583 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for various Kolab plugins.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@skin: "elastic";
+@skin-path: "../../../../skins/@{skin}";
+
+@import (reference) "@{skin-path}/styles/variables";
+@import (reference) "@{skin-path}/styles/mixins";
+
+
+/*** Common folders list extensions ***/
+
+.listing {
+    // Fix focus indicator, because we add div element in the list record
+    @media screen and (min-width: @screen-width-large) {
+        li > div > a {
+            border-left: 2px solid transparent;
+        }
+        li > div > a:focus {
+            border-left: 2px solid @color-list-focus-indicator;
+            outline: 0;
+        }
+    }
+
+    li {
+        & > div {
+            display: flex;
+
+            & > a:first-child {
+                .overflow-ellipsis;
+                position: relative;
+                flex-grow: 1;
+
+                &:after {
+                    color: #ccc;
+                    position: absolute;
+                    top: 0;
+                    right: 0;
+                    height: @listing-line-height !important;
+                    font-size: 1.1em !important;
+                }
+
+                & + input {
+                    position: initial;
+                }
+            }
+
+            &.folder .listname:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-sticky-note;
+                margin-right: .5rem;
+            }
+
+            span.actions {
+                display: flex;
+
+                input + & {
+                    padding-right: 2em;
+                }
+
+                a {
+                    padding: 0;
+                    margin: 0;
+                    margin-right: .2rem;
+                    cursor: pointer;
+
+                    &:before {
+                        margin: 0;
+                    }
+
+                    &.remove {
+                        display: none;
+                    }
+                }
+            }
+
+            a.quickview {
+                &:before {
+                    content: @fa-var-eye;
+                    opacity: .2;
+                    color: @color-link;
+                }
+
+                &:after {
+                    display: none !important;
+                }
+            }
+
+            &.focusview {
+                a.quickview:before {
+                    content: @fa-var-eye;
+                    opacity: 1;
+                }
+            }
+
+            .subscribed {
+                cursor: pointer;
+                // reset listing's link style
+                padding: 0;
+                border-left: 0;
+                width: auto;
+
+                &:before {
+                    .font-icon-regular(@fa-var-bookmark); // TODO: better icon
+                    height: auto;
+                    color: @color-link;
+                    margin-right: .25rem;
+                }
+            }
+
+            // span.subscribed is used on addressbooks list, a.subscribed in other places
+            span.subscribed:before {
+                &:extend(.font-icon-class);
+                .font-icon-regular(@fa-var-bookmark); // TODO: better icon
+            }
+
+            &.subscribed {
+                .subscribed:before {
+                    .font-icon-solid(@fa-var-bookmark); // TODO: better icon
+                }
+            }
+        }
+
+        &.selected > div {
+            color: @color-list-selected;
+            background-color: @color-list-selected-background;
+        }
+
+        & > div.readonly a:first-child,
+        &.readonly:not(.virtual) > div a:first-child {
+            padding-right: 1.6em;
+
+            &:after {
+                &:extend(.font-icon-class);
+                content: @fa-var-lock;
+            }
+        }
+
+        & > div.other.user > .listname,
+        &.other.user > div a:first-child {
+            &:before {
+                .font-icon-solid(@fa-var-user);
+            }
+        }
+
+        & > div.virtual.user > .listname,
+        &.virtual.user > div a:first-child {
+            &:after {
+                display: none;
+            }
+        }
+
+        & > div.virtual.shared > .listname,
+        &.virtual.shared > div a:first-child {
+            &:before {
+                .font-icon-solid(@fa-var-share-alt);
+            }
+
+            &:after {
+                display: none;
+            }
+        }
+
+        &.virtual > div > a {
+            opacity: .5;
+        }
+    }
+
+    // Tree structure fix
+    &.treelist:not(.notree) {
+        & > li > div > a {
+            padding-left: @listing-treetoggle-width;
+        }
+    }
+
+    input.flex-checkbox {
+        position: relative !important;
+        margin: 0 0 0 .25em !important;
+
+        & + label {
+            position: relative !important;
+            margin: 0 .3em 0 -1em !important;
+            right: 0 !important;
+            font-size: 1.15em;
+        }
+    }
+
+    li.droptarget > div {
+        background-color: @color-list-droptarget-background;
+    }
+
+    li .count {
+        position: absolute;
+        top: 0;
+        right: 0;
+        min-width: 2em;
+        line-height: 1.4rem;
+        margin: (@listing-line-height - 1.4rem)/2;
+        padding: 0 .3em;
+        border-radius: .4em;
+        background: @color-list-secondary;
+        color: #fff;
+        text-align: center;
+        font-weight: bold;
+
+        html.touch & {
+            line-height: 2rem;
+            margin: (@listing-touch-line-height - 2rem)/2;
+        }
+    }
+}
+
+html.touch .listing {
+    li {
+        & > div {
+            a:after {
+                height: @listing-touch-line-height !important;
+            }
+        }
+
+        .actions {
+            margin-left: .2rem;
+            a {
+                margin-right: .5rem;
+            }
+        }
+    }
+}
+
+.searchresults {
+    .boxtitle {
+        line-height: 2rem !important;
+        font-size: 80%;
+        padding: 0 .5rem;
+        margin: 0;
+        color: @color-popover-separator;
+        background-color: @color-popover-separator-background;
+        text-align: center;
+        border-bottom: 1px solid @color-layout-border;
+    }
+}
+
+.folderlist li.mailbox {
+    &.type-event > a:before {
+        .font-icon-solid(@fa-var-calendar);
+    }
+    &.type-task > a:before {
+        .font-icon-solid(@fa-var-calendar-check);
+    }
+    &.type-journal > a:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
+    &.type-contact > a:before {
+        .font-icon-regular(@fa-var-address-book);
+    }
+    &.type-note > a:before {
+        .font-icon-regular(@fa-var-sticky-note);
+    }
+    &.type-configuration > a:before {
+        .font-icon-solid(@fa-var-cog);
+    }
+    &.type-freebusy > a:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
+    &.type-file > a:before {
+        .font-icon-solid(@fa-var-folder);
+    }
+}
+
+.toolbarmenu.listing li {
+    &.search {
+        padding: .25rem .5rem;
+        .input-group {
+
+            i.icon {
+                font-size: 80%;
+                padding: .5rem;
+            }
+
+            input {
+                font-size: 100%;
+            }
+        }
+    }
+
+    a.history:before {
+        content: @fa-var-history;
+    }
+}
+
+a.history {
+    &:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-history;
+        display: inline;
+        float: none;
+    }
+}
+
+// E.g. notes preview frame
+.watermark {
+    background: url("@{skin-path}/images/logo.svg") center no-repeat #fff;
+    background-size: 30%;
+    background-blend-mode: luminosity;
+    width: 100%;
+    height: 100%;
+
+    & > * {
+        display: none;
+    }
+
+    // this is to blend the watermark image
+    &:before {
+        content: "";
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: rgba(255, 255, 255, .85);
+    }
+
+    &.formcontainer {
+        background: transparent !important;
+
+        &:before {
+            display: none;
+        }
+
+        & > * {
+            display: initial;
+        }
+    }
+}
+
+.form-group > .datetime {
+    display: flex;
+    white-space: nowrap;
+
+    input {
+        width: 10em;
+    }
+
+    input:first-child {
+        margin-right: .5rem;
+        width: 15em;
+    }
+
+    a {
+        margin-left: 1em;
+        text-align: right;
+        flex: 1;
+        line-height: 2.4;
+    }
+}
+
+.form-section.form-group.form-check {
+    display: flex;
+    padding: 0;
+
+    label {
+        order: 10;
+    }
+
+    .icon-checkbox + label {
+        order: unset;
+        min-width: 2em;
+        padding: 0;
+        line-height: 1;
+    }
+}
+
+button.btn.save.notify:before {
+    content: @fa-var-envelope;
+}
+
+button.btn.print:before {
+    content: @fa-var-print;
+}
+
+.formcontent.text-only .faded * {
+    color: @color-black-shade-text;
+}
+
+.print-config {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10000;
+    padding: .5em 1em;
+    background-color: @color-black-shade-bg;
+
+    button.print {
+        margin-right: 1rem;
+    }
+
+    .prop {
+        margin-left: .5rem;
+        display: inline-block;
+        vertical-align: middle;
+
+        label {
+            margin: 0;
+        }
+
+        label:before {
+            line-height: 1.25;
+            margin-right: .25rem;
+        }
+    }
+
+    @media print {
+        display: none;
+    }
+
+    & + .print-content {
+        position: relative;
+        top: 0;
+        left: 0;
+        height: auto;
+        margin: 5em auto 0 auto;
+        overflow: visible;
+    }
+}
+
+.selection-dialog {
+    .ui-dialog-content {
+        display: flex !important;
+        overflow: hidden !important;
+    }
+
+    .selection-list {
+        display: flex;
+        flex-direction: column;
+        border: 1px solid @color-layout-border;
+        justify-content: center;
+    }
+
+    .ui-dialog-content .popupmenu {
+        display: flex !important; // overwrites .popupmenu style
+        width: 100%;
+    }
+
+    .scroller {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    .header {
+        border-bottom: 1px solid @color-layout-border;
+        display: flex;
+        background-color: @color-layout-header-background;
+        font-size: @layout-header-font-size;
+        font-weight: bold;
+        line-height: @layout-header-height;
+        height: @layout-header-height;
+        min-height: @layout-header-height;
+        padding: 0 .25em;
+        position: relative; // for absolute positioning of searchbar
+        overflow: hidden;
+        white-space: nowrap;
+    }
+
+    .header-title {
+        width: 100%;
+        text-align: center;
+        margin: 0 2em;
+    }
+
+    .selection-content {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .tab-content {
+        margin-top: 1rem;
+        height: 100%;
+        overflow-y: auto;
+    }
+
+    .form-addon {
+        margin: 0;
+        padding: .5rem 0;
+        width: 100%;
+        background-color: @color-black-shade-bg;
+        border-top: 1px solid @color-layout-border;
+    }
+
+    // overwrite .popupmenu colors
+    .listing {
+        ul {
+            background-color: @color-layout-list-background;
+        }
+
+        li.selected {
+            color: @color-font;
+        }
+    }
+
+    @media screen and (max-width: @screen-width-small) {
+        .ui-dialog-content {
+            padding: 0 !important;
+        }
+
+        .selection-list {
+            border: 0;
+        }
+
+        .ui-dialog-titlebar {
+            display: none;
+            margin: 0;
+        }
+
+        .selection-content {
+            .header-title {
+                margin-left: 0;
+            }
+        }
+
+        .header {
+            a:before {
+                font-size: 1.75rem;
+            }
+        }
+    }
+}
+
+// Use icons-only on taskmenu with small screen height
+@media screen and (max-height: 640px) and (min-width: (@screen-width-small + 1px)) {
+    body > #layout > .menu {
+        width: 2.5rem;
+    }
+
+    #taskmenu {
+        a {
+            height: auto;
+            width: 100%;
+
+            &:before {
+                height: 2.1rem;
+                width: 100%;
+            }
+        }
+
+        .special-buttons {
+            width: 2.5rem;
+        }
+
+        span.inner {
+            display: none;
+        }
+    }
+}
+
+@import "include/calendar";
+@import "include/kolab_activesync";
+@import "include/kolab_delegation";
+@import "include/kolab_files";
+@import "include/kolab_notes";
+@import "include/kolab_tags";
+@import "include/libcalendaring";
+@import "include/tasklist";
diff --git a/plugins/libkolab/skins/elastic/templates/attachment.html b/plugins/libkolab/skins/elastic/templates/attachment.html
new file mode 100644
index 00000000..896c6534
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/templates/attachment.html
@@ -0,0 +1,68 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:filename" /></h1>
+
+<div class="sidebar listbox">
+	<div class="header">
+		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="plugin.attachmentcontrols" class="listing props-table" role="contentinfo"
+			aria-labelledby="aria-label-contentinfo" />
+	</div>
+</div>
+
+<div class="content selected">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
+			<span class="inner"><roundcube:label name="properties"></span>
+		</a>
+		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
+		<div id="messagetoolbar" class="toolbar">
+			<roundcube:button command="download-attachment" type="link" label="download" title="download"
+				class="button download disabled" classAct="button download" innerclass="inner" />
+			<roundcube:button command="print-attachment" type="link" label="print" title="print"
+				class="button print disabled" classAct="button print" innerclass="inner" data-hidden="small" />
+			<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
+				<roundcube:button command="image-scale" type="link" prop="+" data-hidden="small"
+					class="button zoomin disabled" classAct="button zoomin"
+					label="zoomin" title="increaseimage" innerclass="inner" />
+				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
+					class="button zoomout disabled" classAct="button zoomout"
+					label="zoomout" title="decreaseimage" innerclass="inner" />
+				<roundcube:button command="image-rotate" type="link"
+					class="button rotate disabled" classAct="button rotate" data-hidden="small"
+					label="rotate" title="rotateimage" innerclass="inner" />
+			<roundcube:endif />
+		</div>
+	</div>
+	<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
+	<div class="iframe-wrapper">
+		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" title="arialabelattachmentpreview"
+			role="main" aria-labelledby="aria-label-messagepart" />
+	</div>
+<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
+	<div id="image-tools" class="image-tools" data-hidden="big">
+		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
+		<div class="toolbar" role="menu" aria-labelledby="aria-label-imagetools">
+			<roundcube:button command="image-scale" type="link" prop="+"
+				class="button zoomin disabled" classAct="button zoomin"
+				label="zoomin" title="increaseimage" innerclass="inner" />
+			<roundcube:button command="image-scale" type="link" prop="-"
+				class="button zoomout disabled" classAct="button zoomout"
+				label="zoomout" title="decreaseimage" innerclass="inner" />
+			<roundcube:button command="image-rotate" type="link"
+				class="button rotate disabled" classAct="button rotate"
+				label="rotate" title="rotateimage" innerclass="inner" />
+		</div>
+		<a href="#" class="button icon tools" onclick="$(this).attr('title', $(this).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')))"
+			data-label-show="<roundcube:label name="showtools" />" data-label-hide="<roundcube:label name="hidetools" />" title="<roundcube:label name="showtools" />">
+			<span class="inner"><roundcube:label name="showtools" /></span>
+		</a>
+	</div>
+<roundcube:endif />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/libkolab/skins/elastic/templates/folderform.html b/plugins/libkolab/skins/elastic/templates/folderform.html
new file mode 100644
index 00000000..243ab024
--- /dev/null
+++ b/plugins/libkolab/skins/elastic/templates/folderform.html
@@ -0,0 +1,9 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:pagetitle" /></h1>
+
+<div class="formcontent">
+	<roundcube:object name="folderform" class="tabbed propform" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/libkolab/skins/larry/libkolab.css b/plugins/libkolab/skins/larry/libkolab.css
index bbf8133a..d17bd262 100644
--- a/plugins/libkolab/skins/larry/libkolab.css
+++ b/plugins/libkolab/skins/larry/libkolab.css
@@ -1,5 +1,10 @@
 
-ul.toolbarmenu li a.history span.history {
+ul.toolbarmenu li a.history {
+	padding: 2px 6px;
+	color: #eee;
+}
+
+ul.toolbarmenu li a.history span.icon {
 	background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAQAAAD8x0bcAAABXUlEQVQoFbXBvUsCYQAH4N/mdm5uN9UStzn1AYG0HC1Jg01tV/9A0NYQ5dRm4BI0VYRYUYOD3CSB2FaLXBJhIXYeXr7veVGd8qus0D6Whp4H+Duq1LnEBDX8jiqz3XpgPzqB3a0zSw3fUetavlux0hkjlc5cnPtut84EBlEJLr1WOoN5RKEiisTylmMHNjX0Pa17rd0TRAFqzOLN8Ma2FN4u+tpVx8Y4Xp1O+y7eaRXroUkFn7xWqYieXFwKfDjek6IxCYAqy6xJ8dBkjatALi4FDfQUN6XIxfEqPJt0bCmkMAuIAXMjx/nnBvPUAGtfip0p9ERmk45tFqDjTQix0TXrzFqg4t3cVhHBh8jECnQqVPAujAS0zqHXOshgQJhKx+ycUUcPx5j33YqFcXwRMo/a94HNMrMsd+58t1gaWsQPMSNlFq7Kvlu7LpaMFGYQwi9U6JjHEgzMQMU/eAHASL3dDo5S4wAAAABJRU5ErkJggg==');
 	background-position: 0px 2px;
 	background-repeat: no-repeat;
@@ -65,3 +70,74 @@ ul.toolbarmenu li a.history span.history {
 #mailmessagehistory .changelog-table .operation {
 	width: 25%;
 }
+
+fieldset.birthdays .proplist li {
+	padding: 0;
+	border: 0;
+}
+
+fieldset.categories input {
+	height: auto !important;
+	line-height: 16px !important;
+}
+
+#calendarcategories .minicolors-swatch {
+	height: 14px;
+	width: 14px;
+}
+
+a.button.input-group-text {
+	line-height: 19px;
+	vertical-align: middle;
+}
+
+.libkolab.attachmentwin #attachmenttoolbar {
+	position: relative;
+	top: -6px;
+	height: 40px;
+}
+
+.libkolab.attachmentwin #attachmentcontainer {
+	position: absolute;
+	top: 0;
+	left: 232px;
+	right: 0;
+	bottom: 0;
+}
+
+.libkolab.attachmentwin #attachmentframe {
+	width: 100%;
+	height: 100%;
+	border: 0;
+	background-color: #fff;
+	border-radius: 4px;
+}
+
+.libkolab.attachmentwin #partheader {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 220px;
+	bottom: 0;
+}
+
+.libkolab.attachmentwin #partheader table {
+	table-layout: fixed;
+	overflow: hidden;
+}
+
+.libkolab.attachmentwin #partheader table td {
+	color: #666;
+	padding: 4px 6px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.libkolab.attachmentwin #partheader table td.header {
+	font-weight: bold;
+}
+
+.libkolab.attachmentwin #partheader table td.title {
+	width: 60px;
+	padding-right: 0;
+}
diff --git a/plugins/tasklist/skins/larry/templates/attachment.html b/plugins/libkolab/skins/larry/templates/attachment.html
similarity index 89%
rename from plugins/tasklist/skins/larry/templates/attachment.html
rename to plugins/libkolab/skins/larry/templates/attachment.html
index 68d4dd99..4acc2e7b 100644
--- a/plugins/tasklist/skins/larry/templates/attachment.html
+++ b/plugins/libkolab/skins/larry/templates/attachment.html
@@ -4,7 +4,7 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body class="extwin tasklist attachmentwin">
+<body class="extwin libkolab attachmentwin">
 
 <div id="header">
 <div id="topline" role="banner" aria-labelledby="aria-label-topnav">
@@ -53,10 +53,10 @@
 <script type="text/javascript">
 
 $(document).ready(function() {
-	if (window.rcube_splitter) {
-		new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
-			orientation:'v', relative:true, start:226, min:150, size:12}).init();
-	}
+    if (window.rcube_splitter) {
+        new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
+            orientation:'v', relative:true, start:226, min:150, size:12}).init();
+    }
 });
 
 </script>
diff --git a/plugins/kolab_notes/skins/larry/templates/kolabacl.html b/plugins/libkolab/skins/larry/templates/folderform.html
similarity index 54%
rename from plugins/kolab_notes/skins/larry/templates/kolabacl.html
rename to plugins/libkolab/skins/larry/templates/folderform.html
index ed9b0c7e..688abe17 100644
--- a/plugins/kolab_notes/skins/larry/templates/kolabacl.html
+++ b/plugins/libkolab/skins/larry/templates/folderform.html
@@ -3,22 +3,14 @@
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
-<style type="text/css" media="screen">
-
-body.aclform {
-	background: #efefef;
-	margin: 0;
-}
-
-body.aclform .hint {
-	margin: 1em;
-}
-
-</style>
 </head>
-<body class="iframe aclform">
+<body class="iframe fullheight">
 
-<roundcube:object name="folderacl" />
+<h1 class="voice"><roundcube:var name="env:pagetitle" /></h1>
+
+<div class="boxcontent">
+	<roundcube:object name="folderform" class="tabbed propform" />
+</div>
 
 <roundcube:include file="/includes/footer.html" />
 
diff --git a/plugins/libkolab/tests/kolab_date_recurrence.php b/plugins/libkolab/tests/kolab_date_recurrence.php
new file mode 100644
index 00000000..9ea3db7b
--- /dev/null
+++ b/plugins/libkolab/tests/kolab_date_recurrence.php
@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * kolab_date_recurrence tests
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2017, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_date_recurrence_test extends PHPUnit_Framework_TestCase
+{
+    function setUp()
+    {
+        $rcube = rcmail::get_instance();
+        $rcube->plugins->load_plugin('libkolab', true, true);
+    }
+
+    /**
+     * kolab_date_recurrence::first_occurrence()
+     *
+     * @dataProvider data_first_occurrence
+     */
+    function test_first_occurrence($recurrence_data, $start, $expected)
+    {
+        $start = new DateTime($start);
+        if (!empty($recurrence_data['UNTIL'])) {
+            $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
+        }
+
+        $event  = array('start' => $start, 'recurrence' => $recurrence_data);
+        $object = kolab_format::factory('event', 3.0);
+        $object->set($event);
+
+        $recurrence = new kolab_date_recurrence($object);
+        $first      = $recurrence->first_occurrence();
+
+        $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
+    }
+
+    /**
+     * Data for test_first_occurrence()
+     */
+    function data_first_occurrence()
+    {
+        // TODO: BYYEARDAY, BYWEEKNO, BYSETPOS, WKST
+
+        return array(
+            // non-recurring
+            array(
+                array(),                                     // recurrence data
+                '2017-08-31 11:00:00',                       // start date
+                '2017-08-31 11:00:00',                       // expected result
+            ),
+            // daily
+            array(
+                array('FREQ' => 'DAILY', 'INTERVAL' => '1'), // recurrence data
+                '2017-08-31 11:00:00',                       // start date
+                '2017-08-31 11:00:00',                       // expected result
+            ),
+            // TODO: this one is not supported by the Calendar UI
+            array(
+                array('FREQ' => 'DAILY', 'INTERVAL' => '1', 'BYMONTH' => 1),
+                '2017-08-31 11:00:00',
+                '2018-01-01 11:00:00',
+            ),
+            // weekly
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-08-31 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-06 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'TH'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-08-31 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'FR'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-01 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '2'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-08-31 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '3', 'BYDAY' => 'WE'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-20 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'COUNT' => 1),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-06 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'UNTIL' => '2017-09-01'),
+                '2017-08-31 11:00:00', // Thursday
+                '',
+            ),
+            // monthly
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1'),
+                '2017-09-08 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+                '2017-08-31 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+                '2017-09-08 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '1WE'),
+                '2017-08-16 11:00:00',
+                '2017-09-06 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '-1WE'),
+                '2017-08-16 11:00:00',
+                '2017-08-30 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2'),
+                '2017-09-08 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2', 'BYMONTHDAY' => '8'),
+                '2017-08-31 11:00:00',
+                '2017-09-08 11:00:00', // ??????
+            ),
+            // yearly
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1'),
+                '2017-08-16 12:00:00',
+                '2017-08-16 12:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8'),
+                '2017-08-16 12:00:00',
+                '2017-08-16 12:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYDAY' => '-1MO'),
+                '2017-08-16 11:00:00',
+                '2017-12-25 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8', 'BYDAY' => '-1MO'),
+                '2017-08-16 11:00:00',
+                '2017-08-28 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1', 'BYDAY' => '1MO'),
+                '2017-08-16 11:00:00',
+                '2018-01-01 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1,9', 'BYDAY' => '1MO'),
+                '2017-08-16 11:00:00',
+                '2017-09-04 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '2'),
+                '2017-08-16 11:00:00',
+                '2017-08-16 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYMONTH' => '8'),
+                '2017-08-16 11:00:00',
+                '2017-08-16 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYDAY' => '-1MO'),
+                '2017-08-16 11:00:00',
+                '2017-12-25 11:00:00',
+            ),
+            // on dates (FIXME: do we really expect the first occurrence to be on the start date?)
+            array(
+                array('RDATE' => array (new DateTime('2017-08-10 11:00:00 Europe/Warsaw'))),
+                '2017-08-01 11:00:00',
+                '2017-08-01 11:00:00',
+            ),
+        );
+    }
+
+    /**
+     * kolab_date_recurrence::first_occurrence() for all-day events
+     *
+     * @dataProvider data_first_occurrence
+     */
+    function test_first_occurrence_allday($recurrence_data, $start, $expected)
+    {
+        $start = new DateTime($start);
+        if (!empty($recurrence_data['UNTIL'])) {
+            $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
+        }
+
+        $event  = array('start' => $start, 'recurrence' => $recurrence_data, 'allday' => true);
+        $object = kolab_format::factory('event', 3.0);
+        $object->set($event);
+
+        $recurrence = new kolab_date_recurrence($object);
+        $first      = $recurrence->first_occurrence();
+
+        $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
+    }
+}
+
diff --git a/plugins/logon_page/composer.json b/plugins/logon_page/composer.json
index 8a72a498..974e5eb3 100644
--- a/plugins/logon_page/composer.json
+++ b/plugins/logon_page/composer.json
@@ -4,7 +4,7 @@
     "description": "Logon screen additions",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "0.1.0",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
diff --git a/plugins/odfviewer/composer.json b/plugins/odfviewer/composer.json
index b3a0f6d1..732c61af 100644
--- a/plugins/odfviewer/composer.json
+++ b/plugins/odfviewer/composer.json
@@ -4,7 +4,7 @@
     "description": "Open Document Viewer plugin",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.3",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/odfviewer/odfviewer.php b/plugins/odfviewer/odfviewer.php
index 42332e5a..2272da30 100644
--- a/plugins/odfviewer/odfviewer.php
+++ b/plugins/odfviewer/odfviewer.php
@@ -97,9 +97,9 @@ class odfviewer extends rcube_plugin
         $rcmail     = rcube::get_instance();
         $assets_dir = $rcmail->config->get('assets_dir');
 
-        $mtime = filemtime($this->home . '/' . $path);
+        $mtime = @filemtime($this->home . '/' . $path);
         if (!$mtime && $assets_dir) {
-            $mtime = filemtime($assets_dir . '/plugins/odfviewer/' . $path);
+            $mtime = @filemtime($assets_dir . '/plugins/odfviewer/' . $path);
         }
 
         $path = $this->urlbase . $path . ($mtime ? '?s=' . $mtime : '');
diff --git a/plugins/owncloud/README b/plugins/owncloud/README
deleted file mode 100644
index ecf66f3e..00000000
--- a/plugins/owncloud/README
+++ /dev/null
@@ -1,78 +0,0 @@
-Connecting Roundcube with ownCloud
-==================================
-
-ATTENTION: this is just a proof-of-concept and should be be considered for
-production use.
-
-This plugin integrates ownCloud into the Roundcube web UI using iframes.
-Beside giving the user one single location to log-in and get access to all
-his/her data, the integration should also allow one to pick files from
-ownCloud when sending email messages and to store email attachments directly
-to the cloud.
-
-
-HOW IT WORKS
-------------
-
-The plugin embeds the web UI for ownCloud though an iframe into the Roundcube
-user interface. When accessing ownCloud though Roundcube, the user's login
-credentials (username + password) will be handed over to ownCloud in order to
-automatically authenticate the current Roundcube user to ownCloud. This
-exchange happens with HTTP requests directley between the ownCloud server and
-the Roundcube server using signed URLs to prevent from interception.
-
-IMPRTANT: The automatic user authentication only works if both apps use the
-same authentication backend. In the Kolab realm this is LDAP. You therefore
-need to configure the LDAP user authentication backend in ownCloud.
-
-Once authenticated, the user sees the ownCloud file manager within Roundcube
-and can do whether he/she is authorized to do. When composing a new email
-message in Roundcube, an addition button appear to select files from the
-ownCloud storage. (this feaure is not yet fully implemented).
-
-When terminating the session in Roundcube by pressing the Logout button, an
-according message is sent to ownCloud to termiate the user's session there, too.
-
-
-REQUIREMENTS
-------------
-
-* Roundcube version 0.9-beta or higher
-* ownCloud version 4.5 or higher
-* both apps running on the same host (due to browser's XSS protection)
-* both IMAP and ownCloud authenticate users on the same backend
-
-
-INSTALLATION
-------------
-
-Install this plugin in Roundcube and enable it.
-
-Rsync the contents of the copy_to_owncloud folder to the ownCloud installation.
-This will add a new app named "kolab_auth" and a theme "kolab" to ownCloud.
-
-
-Roundcube CONFIGURATION
------------------------
-
-Copy the config.inc.php.dist file to config.inc.php in Roundcube's owncloud
-plugin directory. Then edit the file and set the absolute URL where ownCloud
-is accessible and define a secret string for the authentication credential
-exchange between the swo systems.
-
-
-onwCloud CONFIGURATION
-----------------------
-
-Add the following lines to the ownCloud config array:
-
-  'theme' => 'kolab',
-  'kolaburl' => '<url-to-roundcube>',
-  'kolabsecret' => '<shared-secret-string>',
-
-The value for 'kolabsecret' has to match the 'owncloud_secret' string in
-the Roundcube owncloud plugin configuration.
-
-Log-in to ownCloud as an administrator and enable the kolab_auth app.
-
-
diff --git a/plugins/owncloud/config.inc.php.dist b/plugins/owncloud/config.inc.php.dist
deleted file mode 100644
index 448c6647..00000000
--- a/plugins/owncloud/config.inc.php.dist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-// ownCloud URL
-$config['owncloud_url'] = 'https://owncloud.webmail.tld';
-
-// authentication exchange secret
-// has to be the same as the value for 'kolabsecret' in owncloud config
-$config['owncloud_secret'] = '<shared-secret-string>';
diff --git a/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/app.php b/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/app.php
deleted file mode 100644
index 02e3e151..00000000
--- a/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/app.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
-  Requires the following options in ownCloud config:
-
-  'kolaburl' => 'https://<kolab-host>/<webclient-url>',
-  'kolabsecret' => '<a secret key, the same as in Roundcube owncloud plugin>',
-
-*/
-
-
-// check for kolab auth token
-if (!OC_User::isLoggedIn() && !empty($_GET['kolab_auth'])) {
-	OCP\Util::writeLog('kolab_auth', 'got kolab auth token', OCP\Util::INFO);
-
-	// decode auth data from Roundcube
-	parse_str(oc_kolab_decode($_GET['kolab_auth']), $request);
-
-	// send back as POST request with session cookie
-	$postdata = http_build_query($request, '', '&');
-
-	// add request signature using secret key
-	$postdata .= '&hmac=' . hash_hmac('sha256', $postdata, OC_Config::getValue('kolabsecret', '<da-sso-secret-key>'));
-
-	$context = stream_context_create(array(
-		'http' => array(
-			'method' => 'POST',
-				'header'=> "Content-type: application/x-www-form-urlencoded\r\n"
-	 				. "Content-Length: " . strlen($postdata) . "\r\n"
-					. "Cookie: " . $request['cname'] . '=' . $request['session'] . "\r\n",
-				'content' => $postdata,
-			)
-		)
-	);
-
-	$url = !empty($_SERVER['HTTP_REFERER']) ? dirname($_SERVER['HTTP_REFERER']) . '/' : OC_Config::getValue('kolaburl', '');
-	$auth = @json_decode(file_get_contents($url . '?_action=owncloudsso', false, $context), true);
-
-	// fake HTTP authentication with user credentials received from Roundcube
-	if ($auth['user'] && $auth['pass']) {
-		$_SERVER['PHP_AUTH_USER'] = $auth['user'];
-		$_SERVER['PHP_AUTH_PW']   = $auth['pass'];
-	}
-}
-
-function oc_kolab_decode($str)
-{
-	// TODO: chose a more sophisticated encryption method
-	return base64_decode(str_pad(strrev($str), strlen($str) % 4, '=', STR_PAD_RIGHT));
-}
-
diff --git a/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/info.xml b/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/info.xml
deleted file mode 100644
index aad9cea7..00000000
--- a/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>kolab_auth</id>
-	<name>Kolab user authentication</name>
-	<description>Allow to authenticate an existing Kolab web client session</description>
-	<licence>AGPL</licence>
-	<author>Thomas Bruederli</author>
-	<require>4.9</require>
-	<shipped>true</shipped>
-	<types>
-		<prelogin/>
-	</types>
-</info>
diff --git a/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/version b/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/version
deleted file mode 100644
index 6e8bf73a..00000000
--- a/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1.0
diff --git a/plugins/owncloud/copy_to_owncloud/themes/kolab/core/css/styles.css b/plugins/owncloud/copy_to_owncloud/themes/kolab/core/css/styles.css
deleted file mode 100755
index 290721bc..00000000
--- a/plugins/owncloud/copy_to_owncloud/themes/kolab/core/css/styles.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#content,
-#controls,
-#navigation {
-	top: 0px;
-}
-
-#navigation #settings {
-	bottom: 0px;
-}
-
-#leftcontent, .leftcontent,
-#rightcontent, .rightcontent {
-	top: 2.9em;
-}
\ No newline at end of file
diff --git a/plugins/owncloud/copy_to_owncloud/themes/kolab/core/js/kolab.js b/plugins/owncloud/copy_to_owncloud/themes/kolab/core/js/kolab.js
deleted file mode 100644
index f5204567..00000000
--- a/plugins/owncloud/copy_to_owncloud/themes/kolab/core/js/kolab.js
+++ /dev/null
@@ -1,58 +0,0 @@
-
-function kolab_connector()
-{
-	var remote;
-
-	// public members
-	this.window = window;
-
-	// export public methods
-	this.init = init;
-	this.init_picker = init_picker;
-	this.list_files = list_files;
-
-	function init(rcube)
-	{
-		remote = rcube;
-	}
-
-	function init_picker(rcube)
-	{
-		remote = rcube;
-		
-		if (window.FileActions) {
-			// reset already registered actions
-			// FileActions.actions.file = {};
-
-			FileActions.register('file','Pick', OC.PERMISSION_READ, '', function(filename){
-				var dir = $('#dir').val();
-				remote.file_picked(dir, filename);
-			});
-			FileActions.setDefault('file', 'Pick');
-		}
-	}
-
-	function list_files()
-	{
-		var files = [];
-		$('#fileList tr').each(function(item){
-			var row = $(item),
-				type = row.attrib('data-type'),
-				file = row.attrib('data-file'),
-				mime = row.attrib('data-mime');
-			
-			if (type == 'file') {
-				files.push(file);
-			}
-		});
-
-		return files;
-	}
-}
-
-$(document).ready(function(){
-	// connect with Roundcube running in parent window
-	if (window.parent && parent.rcmail && parent.rcube_owncloud) {
-		parent.rcube_owncloud.connect(new kolab_connector());
-	}
-});
\ No newline at end of file
diff --git a/plugins/owncloud/copy_to_owncloud/themes/kolab/core/templates/layout.user.php b/plugins/owncloud/copy_to_owncloud/themes/kolab/core/templates/layout.user.php
deleted file mode 100644
index a588eacb..00000000
--- a/plugins/owncloud/copy_to_owncloud/themes/kolab/core/templates/layout.user.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
-		<?php endforeach; ?>
-		<script type="text/javascript">
-			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
-			var oc_current_user = '<?php echo OC_User::getUser() ?>';
-			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
-		</script>
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
-		<?php endforeach; ?>
-		<script type="text/javascript" src="<?php echo OC::$WEBROOT.'/themes/kolab/core/js/kolab.js'; ?>"></script>
-		<?php foreach($_['headers'] as $header): ?>
-			<?php
-				echo '<'.$header['tag'].' ';
-				foreach($header['attributes'] as $name=>$value) {
-					echo "$name='$value' ";
-				};
-				echo '/>';
-			?>
-		<?php endforeach; ?>
-	</head>
-
-	<body id="<?php echo $_['bodyid'];?>">
-		<nav><div id="navigation">
-			<ul id="apps" class="svg">
-				<?php foreach($_['navigation'] as $entry): ?>
-					<li data-id="<?php echo $entry['id']; ?>"><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
-					</li>
-				<?php endforeach; ?>
-			</ul>
-
-			<ul id="settings" class="svg">
-				<img role=button tabindex=0 id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
-				<span><?php echo $l->t('Settings');?></span>
-				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
-				<?php foreach($_['settingsnavigation'] as $entry):?>
-					<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
-				<?php endforeach; ?>
-				</div>
-			</ul>
-		</div></nav>
-
-		<div id="content">
-			<?php echo $_['content']; ?>
-		</div>
-	</body>
-</html>
diff --git a/plugins/owncloud/localization/bg_BG.inc b/plugins/owncloud/localization/bg_BG.inc
deleted file mode 100644
index a42b9738..00000000
--- a/plugins/owncloud/localization/bg_BG.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Файлове';
-?>
diff --git a/plugins/owncloud/localization/ca_ES.inc b/plugins/owncloud/localization/ca_ES.inc
deleted file mode 100644
index 1703a1de..00000000
--- a/plugins/owncloud/localization/ca_ES.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Files';
-?>
diff --git a/plugins/owncloud/localization/cs_CZ.inc b/plugins/owncloud/localization/cs_CZ.inc
deleted file mode 100644
index a1f3187e..00000000
--- a/plugins/owncloud/localization/cs_CZ.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Soubory';
-?>
diff --git a/plugins/owncloud/localization/da_DK.inc b/plugins/owncloud/localization/da_DK.inc
deleted file mode 100644
index 6b4d91c3..00000000
--- a/plugins/owncloud/localization/da_DK.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Filer';
-?>
diff --git a/plugins/owncloud/localization/de_CH.inc b/plugins/owncloud/localization/de_CH.inc
deleted file mode 100644
index 33dc4439..00000000
--- a/plugins/owncloud/localization/de_CH.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Dateien';
-?>
diff --git a/plugins/owncloud/localization/de_DE.inc b/plugins/owncloud/localization/de_DE.inc
deleted file mode 100644
index 33dc4439..00000000
--- a/plugins/owncloud/localization/de_DE.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Dateien';
-?>
diff --git a/plugins/owncloud/localization/en_US.inc b/plugins/owncloud/localization/en_US.inc
deleted file mode 100644
index f5cb8fb8..00000000
--- a/plugins/owncloud/localization/en_US.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['owncloud'] = 'Files';
-
-?>
diff --git a/plugins/owncloud/localization/es_AR.inc b/plugins/owncloud/localization/es_AR.inc
deleted file mode 100644
index d8d87720..00000000
--- a/plugins/owncloud/localization/es_AR.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Archivos';
-?>
diff --git a/plugins/owncloud/localization/es_ES.inc b/plugins/owncloud/localization/es_ES.inc
deleted file mode 100644
index 1703a1de..00000000
--- a/plugins/owncloud/localization/es_ES.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Files';
-?>
diff --git a/plugins/owncloud/localization/et_EE.inc b/plugins/owncloud/localization/et_EE.inc
deleted file mode 100644
index 1703a1de..00000000
--- a/plugins/owncloud/localization/et_EE.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Files';
-?>
diff --git a/plugins/owncloud/localization/fi_FI.inc b/plugins/owncloud/localization/fi_FI.inc
deleted file mode 100644
index 7ebf6df6..00000000
--- a/plugins/owncloud/localization/fi_FI.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Tiedostot';
-?>
diff --git a/plugins/owncloud/localization/fr_FR.inc b/plugins/owncloud/localization/fr_FR.inc
deleted file mode 100644
index 81b61700..00000000
--- a/plugins/owncloud/localization/fr_FR.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Fichiers';
-?>
diff --git a/plugins/owncloud/localization/he.inc b/plugins/owncloud/localization/he.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/he.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/hr.inc b/plugins/owncloud/localization/hr.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/hr.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/hu_HU.inc b/plugins/owncloud/localization/hu_HU.inc
deleted file mode 100644
index c29ea9de..00000000
--- a/plugins/owncloud/localization/hu_HU.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Fájlok';
-?>
diff --git a/plugins/owncloud/localization/it_IT.inc b/plugins/owncloud/localization/it_IT.inc
deleted file mode 100644
index fba73792..00000000
--- a/plugins/owncloud/localization/it_IT.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'File';
-?>
diff --git a/plugins/owncloud/localization/ja_JP.inc b/plugins/owncloud/localization/ja_JP.inc
deleted file mode 100644
index f4dc46e5..00000000
--- a/plugins/owncloud/localization/ja_JP.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'ファイル';
-?>
diff --git a/plugins/owncloud/localization/ku_IQ.inc b/plugins/owncloud/localization/ku_IQ.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/ku_IQ.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/nl_NL.inc b/plugins/owncloud/localization/nl_NL.inc
deleted file mode 100644
index 4e631c5e..00000000
--- a/plugins/owncloud/localization/nl_NL.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Bestanden';
-?>
diff --git a/plugins/owncloud/localization/pl.inc b/plugins/owncloud/localization/pl.inc
deleted file mode 100644
index 40090ac7..00000000
--- a/plugins/owncloud/localization/pl.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Pliki';
-?>
diff --git a/plugins/owncloud/localization/pl_PL.inc b/plugins/owncloud/localization/pl_PL.inc
deleted file mode 100644
index 40090ac7..00000000
--- a/plugins/owncloud/localization/pl_PL.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Pliki';
-?>
diff --git a/plugins/owncloud/localization/pt_BR.inc b/plugins/owncloud/localization/pt_BR.inc
deleted file mode 100644
index cae8c161..00000000
--- a/plugins/owncloud/localization/pt_BR.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Arquivos';
-?>
diff --git a/plugins/owncloud/localization/ro.inc b/plugins/owncloud/localization/ro.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/ro.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/ru_RU.inc b/plugins/owncloud/localization/ru_RU.inc
deleted file mode 100644
index 87b3e3df..00000000
--- a/plugins/owncloud/localization/ru_RU.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Файлы';
-?>
diff --git a/plugins/owncloud/localization/sk.inc b/plugins/owncloud/localization/sk.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/sk.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/sl.inc b/plugins/owncloud/localization/sl.inc
deleted file mode 100644
index ba20ec1d..00000000
--- a/plugins/owncloud/localization/sl.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Dokumenti';
-?>
diff --git a/plugins/owncloud/localization/sv.inc b/plugins/owncloud/localization/sv.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/sv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/sv_SE.inc b/plugins/owncloud/localization/sv_SE.inc
deleted file mode 100644
index 6b4d91c3..00000000
--- a/plugins/owncloud/localization/sv_SE.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Filer';
-?>
diff --git a/plugins/owncloud/localization/th.inc b/plugins/owncloud/localization/th.inc
deleted file mode 100644
index 164c2ef8..00000000
--- a/plugins/owncloud/localization/th.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'ไฟล์';
-?>
diff --git a/plugins/owncloud/localization/tr_TR.inc b/plugins/owncloud/localization/tr_TR.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/tr_TR.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/uk.inc b/plugins/owncloud/localization/uk.inc
deleted file mode 100644
index ea12a2dd..00000000
--- a/plugins/owncloud/localization/uk.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$labels['owncloud'] = 'Файли';
-?>
diff --git a/plugins/owncloud/localization/vi.inc b/plugins/owncloud/localization/vi.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/vi.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/vi_VN.inc b/plugins/owncloud/localization/vi_VN.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/vi_VN.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/zh_CN.inc b/plugins/owncloud/localization/zh_CN.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/zh_CN.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/localization/zh_TW.inc b/plugins/owncloud/localization/zh_TW.inc
deleted file mode 100644
index acb6c354..00000000
--- a/plugins/owncloud/localization/zh_TW.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/plugins/owncloud/owncloud.js b/plugins/owncloud/owncloud.js
deleted file mode 100644
index f52e25c1..00000000
--- a/plugins/owncloud/owncloud.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- *
- */
-function rcube_owncloud()
-{
-	this.cloud;
-	this.dialog;
-}
-
-// singleton getter
-rcube_owncloud.instance = function()
-{
-	if (!rcube_owncloud._instance) {
-		rcube_owncloud._instance = new rcube_owncloud;
-	}
-
-	return rcube_owncloud._instance;
-};
-
-// remote connector
-rcube_owncloud.connect = function(client)
-{
-	rcube_owncloud.instance().connect(client);
-};
-
-rcube_owncloud.prototype = {
-
-// callback from the ownCloud connector script loaded in the iframe
-connect: function(client)
-{
-	var me = this;
-	this.cloud = client;
-
-	if (this.dialog)
-		client.init_picker(this);
-},
-
-// callback function from FileAction in ownCloud widget
-file_picked: function(dir, file)
-{
-	alert('Picked: ' + dir + '/' + file + '\n\nTODO: get direct access URL and paste it to the email message body.');
-
-	if (this.dialog && this.dialog.is(':ui-dialog'))
-		this.dialog.dialog('close');
-},
-
-// open a dialog showing the ownCloud widget
-open_dialog: function(html)
-{
-	// request iframe code from server
-	if (!this.dialog && !html) {
-		var me = this;
-		rcmail.addEventListener('plugin.owncloudembed', function(html){ me.open_dialog(html); });
-		rcmail.http_request('owncloud/embed');
-		return;
-	}
-	// create jQuery dialog with iframe
-	else if (html) {
-		var height = $(window).height() * 0.8;
-		this.dialog = $('<div>')
-			.addClass('owncloudembed')
-			.css({ width:'100%', height:height+'px' })
-			.appendTo(document.body)
-			.html(html);
-
-		this.dialog.dialog({
-			modal: true,
-			autoOpen: false,
-			title: 'Select a file from the cloud',
-			width: '80%',
-			height: height
-		});
-	}
-
-	// open the dialog
-	if (this.dialog && this.dialog.is(':ui-dialog'))
-		this.dialog.dialog('open');
-}
-
-};
-
-// Roundcube startup
-window.rcmail && rcmail.addEventListener('init', function(){
-	// add a button for ownCloud file selection to compose screen
-	if (rcmail.env.action == 'compose') {
-		$('<a>')
-			.addClass('button owncloudcompose')
-			.html('ownCloud')
-			.click(function(){ rcube_owncloud.instance().open_dialog(); return false; })
-			.insertAfter('#compose-attachments input.button')
-			.before('&nbsp;');
-	}
-})
-
diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
deleted file mode 100644
index d8cbbf28..00000000
--- a/plugins/owncloud/owncloud.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * OwnCloud Plugin
- *
- * @author Aleksander 'A.L.E.C' Machniak <machniak@kolabsys.com>
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @licence GNU AGPL
- *
- * Configuration (see config.inc.php.dist)
- * 
- */
-
-class owncloud extends rcube_plugin
-{
-    // all task excluding 'login'
-   public $task = '?(?!login).*';
-    // skip frames
-    public $noframe = true;
-
-    function init()
-    {
-        // requires kolab_auth plugin
-        if (empty($_SESSION['kolab_uid'])) {
-            // temporary:
-            $_SESSION['kolab_uid'] = $_SESSION['username'];
-            // return;
-        }
-
-        $rcmail = rcube::get_instance();
-
-        $this->add_texts('localization/', false);
-
-        // register task
-        $this->register_task('owncloud');
-
-        // register actions
-        $this->register_action('index', array($this, 'action'));
-        $this->register_action('embed', array($this, 'embed'));
-        $this->add_hook('session_destroy', array($this, 'logout'));
-
-        // handler for sso requests sent by the owncloud kolab_auth app
-        if ($rcmail->action == 'owncloudsso' && !empty($_POST['token'])) {
-            $this->add_hook('startup', array($this, 'sso_request'));
-        }
-
-        // add taskbar button
-        $this->add_button(array(
-            'command'    => 'owncloud',
-            'class'      => 'button-owncloud',
-            'classsel'   => 'button-owncloud button-selected',
-            'innerclass' => 'button-inner',
-            'label'      => 'owncloud.owncloud',
-            ), 'taskbar');
-
-        // add style for taskbar button (must be here) and Help UI
-        $this->include_stylesheet($this->local_skin_path()."/owncloud.css");
-
-        if ($rcmail->task == 'owncloud' || $rcmail->action == 'compose') {
-            $this->include_script('owncloud.js');
-        }
-    }
-
-    function action()
-    {
-        $rcmail = rcube::get_instance();
-
-        $rcmail->output->add_handlers(array('owncloudframe' => array($this, 'frame')));
-        $rcmail->output->set_pagetitle($this->gettext('owncloud'));
-        $rcmail->output->send('owncloud.owncloud');
-    }
-
-    function embed()
-    {
-        $rcmail = rcmail::get_instance();
-        $rcmail->output->command('plugin.owncloudembed', $this->frame());
-        $rcmail->output->send();
-    }
-
-    function frame()
-    {
-        $rcmail = rcube::get_instance();
-        $this->load_config();
-
-        // generate SSO auth token
-        if (empty($_SESSION['owncloudauth']))
-            $_SESSION['owncloudauth'] = md5('ocsso' . $_SESSION['user_id'] . microtime() . $rcmail->config->get('des_key'));
-
-        $src  = $rcmail->config->get('owncloud_url');
-        $src .= '?kolab_auth=' . strrev(rtrim(base64_encode(http_build_query(array(
-            'session' => session_id(),
-            'cname'   => session_name(),
-            'token'   => $_SESSION['owncloudauth'],
-        ))), '='));
-
-        return html::tag('iframe', array('id' => 'owncloudframe', 'src' => $src,
-            'width' => "100%", 'height' => "100%", 'frameborder' => 0));
-    }
-
-    function logout()
-    {
-        $rcmail = rcube::get_instance();
-        $this->load_config();
-
-        // send logout request to owncloud
-        $logout_url = $rcmail->config->get('owncloud_url') . '?logout=true';
-        $rcmail->output->add_script("new Image().src = '$logout_url';", 'foot');
-    }
-
-    function sso_request()
-    {
-        $response = array();
-        $sign_valid = false;
-
-        $rcmail = rcube::get_instance();
-        $this->load_config();
-
-        // check signature
-        if ($hmac = $_POST['hmac']) {
-            unset($_POST['hmac']);
-            $postdata = http_build_query($_POST, '', '&');
-            $sign_valid = ($hmac == hash_hmac('sha256', $postdata, $rcmail->config->get('owncloud_secret', '<undefined-secret>')));
-        }
-
-        // if ownCloud sent a valid auth request, return plain username and password
-        if ($sign_valid && !empty($_POST['token']) && $_POST['token'] == $_SESSION['owncloudauth']) {
-            $user = $_SESSION['kolab_uid']; // requires kolab_auth plugin
-            $pass = $rcmail->decrypt($_SESSION['password']);
-            $response = array('user' => $user, 'pass' => $pass);
-        }
-
-        echo json_encode($response);
-        exit;
-    }
-
-}
diff --git a/plugins/owncloud/skins/classic/cloud.png b/plugins/owncloud/skins/classic/cloud.png
deleted file mode 100644
index 15a288f7..00000000
Binary files a/plugins/owncloud/skins/classic/cloud.png and /dev/null differ
diff --git a/plugins/owncloud/skins/classic/owncloud.css b/plugins/owncloud/skins/classic/owncloud.css
deleted file mode 100644
index 920b730e..00000000
--- a/plugins/owncloud/skins/classic/owncloud.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/***** ownCloud plugin styles *****/
-
-#taskbar a.button-owncloud
-{
-  background-image: url(cloud.png);
-}
-
-.owncloud-box
-{
-  overflow: auto;  
-  background-color: #F2F2F2;
-}
diff --git a/plugins/owncloud/skins/classic/templates/owncloud.html b/plugins/owncloud/skins/classic/templates/owncloud.html
deleted file mode 100644
index efbd3628..00000000
--- a/plugins/owncloud/skins/classic/templates/owncloud.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/owncloud.css" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-
-<div id="mainscreen" class="box owncloud-box">
-  <roundcube:object name="owncloudframe" />
-</div>
-
-</body>
-</html>
diff --git a/plugins/owncloud/skins/larry/cloud.png b/plugins/owncloud/skins/larry/cloud.png
deleted file mode 100644
index 7ad3cd96..00000000
Binary files a/plugins/owncloud/skins/larry/cloud.png and /dev/null differ
diff --git a/plugins/owncloud/skins/larry/owncloud.css b/plugins/owncloud/skins/larry/owncloud.css
deleted file mode 100644
index 1e9aa891..00000000
--- a/plugins/owncloud/skins/larry/owncloud.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/***** ownCloud plugin styles *****/
-
-#taskbar a.button-owncloud span.button-inner
-{
-  background: url(cloud.png) 5px 5px no-repeat;
-  height: 14px;
-}
-
-#taskbar a.button-owncloud:hover span.button-inner,                                                                                                                      
-#taskbar a.button-owncloud.button-selected span.button-inner
-{
-  background: url(cloud.png) 5px -16px no-repeat;
-  height: 14px;
-}
diff --git a/plugins/owncloud/skins/larry/templates/owncloud.html b/plugins/owncloud/skins/larry/templates/owncloud.html
deleted file mode 100644
index 30638923..00000000
--- a/plugins/owncloud/skins/larry/templates/owncloud.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/owncloud.css" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
-</head>
-<body class="owncloud noscroll">
-
-<roundcube:include file="/includes/header.html" />
-
-<div id="mainscreen" class="uibox" style="overflow: hidden">
-    <roundcube:object name="owncloudframe" />
-</div>
-
-<roundcube:include file="/includes/footer.html" />
-
-</body>
-</html>
diff --git a/plugins/pdfviewer/composer.json b/plugins/pdfviewer/composer.json
index 6e7a2e2c..98121c09 100644
--- a/plugins/pdfviewer/composer.json
+++ b/plugins/pdfviewer/composer.json
@@ -4,7 +4,7 @@
     "description": "Inline PDF viewer plugin",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.5",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/tasklist/README b/plugins/tasklist/README
index 4b326e7d..8ca6a5f5 100644
--- a/plugins/tasklist/README
+++ b/plugins/tasklist/README
@@ -12,9 +12,9 @@ necessary. To do so, execute the SQL commands in
 drivers/database/SQL/<yourdatabase>.initial.sql
 
 For some general calendar-based operations such as alarms handling, this
-plugin requires the `libcalendaring` plugin which is also part of the
-Kolab Roundcube Plugins repository. Make sure that plugin is installed
-and configured correctly.
+plugin requires the `libcalendaring` plugin, as well as libkolab plugin
+for more skins support, which are also part of the Kolab Roundcube Plugins
+repository. Make sure these plugins are installed and configured correctly.
 
 IMPORTANT
 ---------
diff --git a/plugins/tasklist/composer.json b/plugins/tasklist/composer.json
index 4620e5c2..f38970de 100644
--- a/plugins/tasklist/composer.json
+++ b/plugins/tasklist/composer.json
@@ -4,7 +4,7 @@
     "description": "Task management plugin",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "3.2.8",
+    "version": "3.4.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -21,7 +21,8 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3",
-        "kolab/libcalendaring": ">=3.2.8",
+        "kolab/libcalendaring": ">=3.4.0",
+        "kolab/libkolab": ">=3.4.0",
         "roundcube/jqueryui": ">=1.10.4"
     }
 }
diff --git a/plugins/tasklist/drivers/database/tasklist_database_driver.php b/plugins/tasklist/drivers/database/tasklist_database_driver.php
index d5d97041..02f8e096 100644
--- a/plugins/tasklist/drivers/database/tasklist_database_driver.php
+++ b/plugins/tasklist/drivers/database/tasklist_database_driver.php
@@ -89,7 +89,7 @@ class tasklist_database_driver extends tasklist_driver
     /**
      * Get a list of available tasks lists from this source
      */
-    public function get_lists()
+    public function get_lists($filter = 0)
     {
       // attempt to create a default list for this user
       if (empty($this->lists)) {
@@ -254,19 +254,19 @@ class tasklist_database_driver extends tasklist_driver
             join(',', $list_ids)
         ));
 
-        $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0);
+        $counts = array('all' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'later' => 0);
         while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
             $counts['all']++;
-            if ($rec['flagged'])
-                $counts['flagged']++;
             if (empty($rec['date']))
-                $counts['nodate']++;
+                $counts['later']++;
             else if ($rec['date'] == $today)
                 $counts['today']++;
             else if ($rec['date'] == $tomorrow)
                 $counts['tomorrow']++;
             else if ($rec['date'] < $today)
                 $counts['overdue']++;
+            else if ($rec['date'] > $tomorrow)
+                $counts['later']++;
         }
 
         return $counts;
@@ -332,6 +332,10 @@ class tasklist_database_driver extends tasklist_driver
             $sql_add .= ' AND changed >= ' . $this->rc->db->quote(date('Y-m-d H:i:s', $filter['since']));
         }
 
+        if ($filter['uid']) {
+            $sql_add .= ' AND `uid` IN (' . implode(',', array_map(array($this->rc->db, 'quote'), $filter['uid'])) . ')';
+        }
+
         $tasks = array();
         if (!empty($list_ids)) {
             $result = $this->rc->db->query(sprintf(
@@ -357,10 +361,13 @@ class tasklist_database_driver extends tasklist_driver
     /**
      * Return data of a specific task
      *
-     * @param mixed  Hash array with task properties or task UID
+     * @param mixed   Hash array with task properties or task UID
+     * @param integer Bitmask defining filter criterias.
+     *                See FILTER_* constants for possible values.
+     *
      * @return array Hash array with task properties or false if not found
      */
-    public function get_task($prop)
+    public function get_task($prop, $filter = 0)
     {
         if (is_string($prop))
             $prop['uid'] = $prop;
@@ -558,6 +565,9 @@ class tasklist_database_driver extends tasklist_driver
         if (is_array($prop['recurrence'])) {
             $prop['recurrence'] = $this->serialize_recurrence($prop['recurrence']);
         }
+        if (array_key_exists('complete', $prop)) {
+            $prop['complete'] = number_format($prop['complete'], 2, '.', '');
+        }
 
         foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status') as $col) {
             if (empty($prop[$col]))
@@ -611,6 +621,9 @@ class tasklist_database_driver extends tasklist_driver
         if (is_array($prop['recurrence'])) {
             $prop['recurrence'] = $this->serialize_recurrence($prop['recurrence']);
         }
+        if (array_key_exists('complete', $prop)) {
+            $prop['complete'] = number_format($prop['complete'], 2, '.', '');
+        }
 
         $sql_set = array();
         foreach (array('title', 'description', 'flagged', 'complete') as $col) {
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index fe1af558..1bfff58b 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -120,10 +120,10 @@ class tasklist_kolab_driver extends tasklist_driver
             $alarms = false;
             $rights = 'lr';
             $editable = false;
-            if (($myrights = $folder->get_myrights()) && !PEAR::isError($myrights)) {
+            if ($myrights = $folder->get_myrights()) {
                 $rights = $myrights;
                 if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false)
-                    $editable = strpos($rights, 'i');
+                    $editable = strpos($rights, 'i') !== false;
             }
             $info = $folder->get_folder_info();
             $norename = $readonly || $info['norename'] || $info['protected'];
@@ -147,6 +147,7 @@ class tasklist_kolab_driver extends tasklist_driver
             'rights'    => $rights,
             'norename' => $norename,
             'active' => $folder->is_active(),
+            'owner' => $folder->get_owner(),
             'parentfolder' => $folder->get_parent(),
             'default' => $folder->default,
             'virtual' => $folder->virtual,
@@ -163,8 +164,11 @@ class tasklist_kolab_driver extends tasklist_driver
 
     /**
      * Get a list of available task lists from this source
+     *
+     * @param integer Bitmask defining filter criterias.
+     *                See FILTER_* constants for possible values.
      */
-    public function get_lists(&$tree = null)
+    public function get_lists($filter = 0, &$tree = null)
     {
         $this->_read_lists();
 
@@ -175,12 +179,7 @@ class tasklist_kolab_driver extends tasklist_driver
                 $this->_read_lists(true);
         }
 
-        $folders = array();
-        foreach ($this->lists as $id => $list) {
-            if (!empty($this->folders[$id])) {
-                $folders[] = $this->folders[$id];
-            }
-        }
+        $folders = $this->filter_folders($filter);
 
         // include virtual folders for a full folder tree
         if (!is_null($tree)) {
@@ -251,6 +250,80 @@ class tasklist_kolab_driver extends tasklist_driver
         return $lists;
     }
 
+    /**
+     * Get list of folders according to specified filters
+     *
+     * @param integer Bitmask defining restrictions. See FILTER_* constants for possible values.
+     *
+     * @return array List of task folders
+     */
+    protected function filter_folders($filter)
+    {
+        $this->_read_lists();
+
+        $folders = array();
+        foreach ($this->lists as $id => $list) {
+            if (!empty($this->folders[$id])) {
+                $folder = $this->folders[$id];
+
+                if ($folder->get_namespace() == 'personal') {
+                    $folder->editable = true;
+                }
+                else if ($rights = $folder->get_myrights()) {
+                    if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
+                        $folder->editable = strpos($rights, 'i') !== false;
+                    }
+                }
+
+                $folders[] = $folder;
+            }
+        }
+
+        $plugin = $this->rc->plugins->exec_hook('tasklist_list_filter', array(
+            'list'      => $folders,
+            'filter'    => $filter,
+            'tasklists' => $folders,
+        ));
+
+        if ($plugin['abort'] || !$filter) {
+            return $plugin['tasklists'];
+        }
+
+        $personal = $filter & self::FILTER_PERSONAL;
+        $shared   = $filter & self::FILTER_SHARED;
+
+        $tasklists = array();
+        foreach ($folders as $folder) {
+            if (($filter & self::FILTER_WRITEABLE) && !$folder->editable) {
+                continue;
+            }
+/*
+            if (($filter & self::FILTER_INSERTABLE) && !$folder->insert) {
+                continue;
+            }
+            if (($filter & self::FILTER_ACTIVE) && !$folder->is_active()) {
+                continue;
+            }
+            if (($filter & self::FILTER_PRIVATE) && $folder->subtype != 'private') {
+                continue;
+            }
+            if (($filter & self::FILTER_CONFIDENTIAL) && $folder->subtype != 'confidential') {
+                continue;
+            }
+*/
+            if ($personal || $shared) {
+                $ns = $folder->get_namespace();
+                if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
+                    continue;
+                }
+            }
+
+            $tasklists[$folder->id] = $folder;
+        }
+
+        return $tasklists;
+    }
+
     /**
      * Get the kolab_calendar instance for the given calendar ID
      *
@@ -507,7 +580,7 @@ class tasklist_kolab_driver extends tasklist_driver
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
         $tomorrow      = $tomorrow_date->format('Y-m-d');
 
-        $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0, 'mytasks' => 0);
+        $counts = array('all' => 0, 'today' => 0, 'tomorrow' => 0, 'later' => 0, 'overdue'  => 0);
 
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
@@ -521,18 +594,16 @@ class tasklist_kolab_driver extends tasklist_driver
                     continue;
 
                 $counts['all']++;
-                if ($rec['flagged'])
-                    $counts['flagged']++;
                 if (empty($rec['date']))
-                    $counts['nodate']++;
+                    $counts['later']++;
                 else if ($rec['date'] == $today)
                     $counts['today']++;
                 else if ($rec['date'] == $tomorrow)
                     $counts['tomorrow']++;
                 else if ($rec['date'] < $today)
                     $counts['overdue']++;
-                if ($this->plugin->is_attendee($rec) !== false)
-                    $counts['mytasks']++;
+                else if ($rec['date'] > $tomorrow)
+                    $counts['later']++;
             }
         }
 
@@ -550,6 +621,7 @@ class tasklist_kolab_driver extends tasklist_driver
      *  - from:  Date range start as string (Y-m-d)
      *  - to:    Date range end as string (Y-m-d)
      *  - search: Search query string
+     *  - uid:   Task UIDs
      * @param array List of lists to get tasks from
      * @return array List of tasks records matchin the criteria
      */
@@ -585,6 +657,10 @@ class tasklist_kolab_driver extends tasklist_driver
             $query[] = array('changed', '>=', $filter['since']);
         }
 
+        if ($filter['uid']) {
+            $query[] = array('uid', '=', (array) $filter['uid']);
+        }
+
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
                 continue;
@@ -613,20 +689,24 @@ class tasklist_kolab_driver extends tasklist_driver
     /**
      * Return data of a specific task
      *
-     * @param mixed  Hash array with task properties or task UID
+     * @param mixed   Hash array with task properties or task UID
+     * @param integer Bitmask defining filter criterias for folders.
+     *                See FILTER_* constants for possible values.
+     *
      * @return array Hash array with task properties or false if not found
      */
-    public function get_task($prop)
+    public function get_task($prop, $filter = 0)
     {
-        $this->_read_lists();
         $this->_parse_id($prop);
 
         $id      = $prop['uid'];
         $list_id = $prop['list'];
-        $folders = $list_id ? array($list_id => $this->get_folder($list_id)) : $this->folders;
+        $folders = $list_id ? array($list_id => $this->get_folder($list_id)) : $this->get_lists($filter);
 
         // find task in the available folders
         foreach ($folders as $list_id => $folder) {
+            if (is_array($folder))
+                $folder = $this->folders[$list_id];
             if (is_numeric($list_id) || !$folder)
                 continue;
             if (!$this->tasks[$id] && ($object = $folder->get_object($id))) {
@@ -1308,46 +1388,8 @@ class tasklist_kolab_driver extends tasklist_driver
             $object['recurrence'] = $old['recurrence'];
         }
 
-        // delete existing attachment(s)
-        if (!empty($task['deleted_attachments'])) {
-            foreach ($task['deleted_attachments'] as $attachment) {
-                if (is_array($object['_attachments'])) {
-                    foreach ($object['_attachments'] as $idx => $att) {
-                        if ($att['id'] == $attachment)
-                            $object['_attachments'][$idx] = false;
-                    }
-                }
-            }
-            unset($task['deleted_attachments']);
-        }
-
-        // in kolab_storage attachments are indexed by content-id
-        if (is_array($task['attachments'])) {
-            foreach ($task['attachments'] as $idx => $attachment) {
-                $key = null;
-                // Roundcube ID has nothing to do with the storage ID, remove it
-                if ($attachment['content'] || $attachment['path']) {
-                    unset($attachment['id']);
-                }
-                else {
-                    foreach ((array)$old['_attachments'] as $cid => $oldatt) {
-                        if ($oldatt && $attachment['id'] == $oldatt['id'])
-                            $key = $cid;
-                    }
-                }
-
-                // replace existing entry
-                if ($key) {
-                    $object['_attachments'][$key] = $attachment;
-                }
-                // append as new attachment
-                else {
-                    $object['_attachments'][] = $attachment;
-                }
-            }
-
-            unset($object['attachments']);
-        }
+        unset($task['attachments']);
+        kolab_format::merge_attachments($object, $old);
 
         // allow sequence increments if I'm the organizer
         if ($this->plugin->is_organizer($object) && empty($object['_method'])) {
@@ -1651,7 +1693,7 @@ class tasklist_kolab_driver extends tasklist_driver
         $hidden_fields[] = array('name' => 'oldname', 'value' => $folder_name);
 
         // folder name (default field)
-        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'taskedit-tasklistame', 'size' => 20));
+        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'taskedit-tasklistname', 'size' => 20));
         $fieldprop['name']['value'] = $input_name->show($list['editname'], array('disabled' => ($options['norename'] || $options['protected'])));
 
         // prevent user from moving folder
@@ -1677,78 +1719,6 @@ class tasklist_kolab_driver extends tasklist_driver
             $form['properties']['fields'][$f] = $fieldprop[$f];
         }
 
-        // add folder ACL tab
-        if ($action != 'form-new') {
-            $form['sharing'] = array(
-                'name'    => rcube::Q($this->plugin->gettext('tabsharing')),
-                'content' => html::tag('iframe', array(
-                    'src' => $this->rc->url(array('_action' => 'folder-acl', '_folder' => $folder_name, 'framed' => 1)),
-                    'width' => '100%',
-                    'height' => 280,
-                    'border' => 0,
-                    'style' => 'border:0'),
-                '')
-            );
-        }
-
-        $form_html = '';
-        if (is_array($hidden_fields)) {
-            foreach ($hidden_fields as $field) {
-                $hiddenfield = new html_hiddenfield($field);
-                $form_html .= $hiddenfield->show() . "\n";
-            }
-        }
-
-        // create form output
-        foreach ($form as $tab) {
-            if (is_array($tab['fields']) && empty($tab['content'])) {
-                $table = new html_table(array('cols' => 2));
-                foreach ($tab['fields'] as $col => $colprop) {
-                    $label = !empty($colprop['label']) ? $colprop['label'] : $this->plugin->gettext($col);
-
-                    $table->add('title', html::label($colprop['id'], rcube::Q($label)));
-                    $table->add(null, $colprop['value']);
-                }
-                $content = $table->show();
-            }
-            else {
-                $content = $tab['content'];
-            }
-
-            if (!empty($content)) {
-                $form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) . "\n";
-            }
-        }
-
-        return $form_html;
-    }
-
-    /**
-     * Handler to render ACL form for a notes folder
-     */
-    public function folder_acl()
-    {
-        $this->plugin->require_plugin('acl');
-        $this->rc->output->add_handler('folderacl', array($this, 'folder_acl_form'));
-        $this->rc->output->send('tasklist.kolabacl');
-    }
-
-    /**
-     * Handler for ACL form template object
-     */
-    public function folder_acl_form()
-    {
-        $folder = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_GPC);
-
-        if (strlen($folder)) {
-            $storage = $this->rc->get_storage();
-            $options = $storage->folder_info($folder);
-
-            // get sharing UI from acl plugin
-            $acl = $this->rc->plugins->exec_hook('folder_form',
-                array('form' => array(), 'options' => $options, 'name' => $folder));
-        }
-
-        return $acl['form']['sharing']['content'] ?: html::div('hint', $this->plugin->gettext('aclnorights'));
+        return kolab_utils::folder_form($form, $folder_name, 'tasklist', $hidden_fields);
     }
 }
diff --git a/plugins/tasklist/drivers/tasklist_driver.php b/plugins/tasklist/drivers/tasklist_driver.php
index a0df271a..df68d005 100644
--- a/plugins/tasklist/drivers/tasklist_driver.php
+++ b/plugins/tasklist/drivers/tasklist_driver.php
@@ -79,10 +79,22 @@ abstract class tasklist_driver
     public $alarm_absolute = true;
     public $last_error;
 
+    const FILTER_ALL           = 0;
+    const FILTER_WRITEABLE     = 1;
+    const FILTER_INSERTABLE    = 2;
+    const FILTER_ACTIVE        = 4;
+    const FILTER_PERSONAL      = 8;
+    const FILTER_PRIVATE       = 16;
+    const FILTER_CONFIDENTIAL  = 32;
+    const FILTER_SHARED        = 64;
+
+
     /**
      * Get a list of available task lists from this source
+     * @param integer Bitmask defining filter criterias.
+     *                See FILTER_* constants for possible values.
      */
-    abstract function get_lists();
+    abstract function get_lists($filter = 0);
 
     /**
      * Create a new list assigned to the current user
@@ -196,10 +208,13 @@ abstract class tasklist_driver
     /**
      * Return data of a specific task
      *
-     * @param mixed  Hash array with task properties or task UID
+     * @param mixed   Hash array with task properties or task UID
+     * @param integer Bitmask defining filter criterias for folders.
+     *                See FILTER_* constants for possible values.
+     *
      * @return array Hash array with task properties or false if not found
      */
-    abstract public function get_task($prop);
+    abstract public function get_task($prop, $filter = 0);
 
     /**
      * Get decendents of the given task record
diff --git a/plugins/tasklist/helpdocs/en_US/index.rst b/plugins/tasklist/helpdocs/en_US/index.rst
index ea8770a0..08fd09da 100644
--- a/plugins/tasklist/helpdocs/en_US/index.rst
+++ b/plugins/tasklist/helpdocs/en_US/index.rst
@@ -12,3 +12,4 @@ The *Tasks* module helps you organize your daily jobs and ToDo's and will alert
 
    overview
    manage
+   invitations
diff --git a/plugins/tasklist/helpdocs/en_US/invitations.rst b/plugins/tasklist/helpdocs/en_US/invitations.rst
new file mode 100644
index 00000000..6803bd3f
--- /dev/null
+++ b/plugins/tasklist/helpdocs/en_US/invitations.rst
@@ -0,0 +1,12 @@
+.. index:: Invitation, RSVP
+.. _tasklist-invitations:
+
+Handle Task Assignments
+=======================
+
+You can assign other people to a task. This will send out invitation emails to all
+assignees with the task data attached. That allows one to directly accept
+or decline the invitation.
+
+Chapter :ref:`calendar-invitations` describes how email invitations work
+for event participants. The same applies for task assignees.
diff --git a/plugins/tasklist/helpdocs/en_US/manage.rst b/plugins/tasklist/helpdocs/en_US/manage.rst
index 0695fa45..0e08be1f 100644
--- a/plugins/tasklist/helpdocs/en_US/manage.rst
+++ b/plugins/tasklist/helpdocs/en_US/manage.rst
@@ -12,6 +12,7 @@ Create new Tasks
 **The New Task Dialog**
     Click the *New task* button in the toolbar to get an empty dialog where you enter the
     tasks properties like title, description, start/due dates and reminder settings.
+
     Click *Save* to finally add it to the selected task list.
 
 **Quick Entry**
@@ -45,22 +46,37 @@ This general section has text fields and selectors for various properties. Here
 * ``Tags``: A list of tags assigned to this task. Add one by typing to the text box and hit <Enter>.
 * ``Start``: The date/time, the task is supposed to be worked on.
 * ``Due``: The date/time this job is due. Define a time when setting a reminder for this task.
-* ``Reminder``: This will pop up with an notification at a the specified time before the task is due.
+* ``Reminder``: Will pop up with a notification at a the specified time before the task is due. It is possible to select 'Message' (default) or 'Sound'. When 'Sound' is selected, a sound will be played at the selected time. This setting requires the host to be able to play sounds.
 * ``Complete``: The completeness state of a task in percent. Use the slider or enter a number.
 * ``Tasklist``: The list the task is saved in. Change it to move an event from one list to another.
 
+**Recurrence**
 
-.. only:: kolab
+For periodically recurring task series, this tab has the settings how a task is repeated
+over time.
 
-    **Attachments**
+* ``Repeat``: Start with selecting a repetition interval (e.g. monthly)
+* ``Every``: How often the frequency will be relevant. For example, for a task that takes place every other week choose Weekly and then 2.
+If you choose a frequency of weekly or monthly you can select which days of the week or month the task will occur.
+* ``Until``: Determines the duration of the repetition. The recurrence can either run forever, for a number of times or until a specific date.
 
-    Append files and documents related to this task directly as attachments.
-    Switch to the Attachments tab to upload files to the current task or to remove them again. Adding
-    files works pretty much the same as :ref:`attaching them to email messages <mail-compose-attachments>`:
-    first select a file from your local disk and click *Upload* in order to attach it.
+**Assignments**
 
-    .. note:: Don't forget to finally save the changes by clicking *Save* in the edit dialog.
-        Switching back and forth the tabs will not yet save the data.
+One, or a list of, users can be assigned to the task. The list is managed in this tab.
+
+* ``Organizer``: The user organizing (creating) the task. This is set to the default identity of the logged in user, but a diferent identity for this user can be selected.
+* ``Add Assignee``: Type three letters of the username, and the search box will show a dropdown list of relevant users. Then clieck the 'Add Assignee' button.
+* ``Invitation/notification comment``: When a user is assigned to a task, an email notification is sent out. This field is giving the opportunity to add extra text to this mail notification.
+
+**Attachments**
+
+Sometimes a description text isn't enough to collect information for a specific task.
+Switch to this tab to attach files to the current task or to remove them again. Adding
+files works pretty much the same as :ref:`attaching them to email messages <mail-compose-attachments>`:
+first select a file from your local disk and click *Upload* in order to attach it.
+
+.. note:: Don't forget to finally save the changes by clicking *Save* in the task edit dialog.
+    Switching back and forth between the tabs will not yet save the data.
 
 
 .. index:: Tags
diff --git a/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/index.po
new file mode 100644
index 00000000..48a89a61
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..9319a665
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..b4581f68
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ar/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/kolab/kolab-documentation/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/index.po
index 0ea7db92..77f59394 100644
--- a/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po
index 699b3440..93cd84b1 100644
--- a/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po
index 5706a50c..2e1eb3e0 100644
--- a/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/bg_BG/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/kolab-documentation/language/bg_BG/)\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/kolab/kolab-documentation/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,7 +80,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/tasks/overview.rst:50
 msgid "Tags"
-msgstr ""
+msgstr "Етикети"
 
 #: ../../en_US/_plugins/tasks/overview.rst:52
 msgid ""
diff --git a/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/index.po
index 93f6fd1e..ca8c0f6b 100644
--- a/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po
index 79656bc8..f20d8755 100644
--- a/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po
index 6f8a120e..de64d4e1 100644
--- a/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/ca_ES/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/kolab-documentation/language/ca_ES/)\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/kolab/kolab-documentation/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po
index 7bacaf72..5bdc3122 100644
--- a/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po
index b48ba3df..88dbb6f6 100644
--- a/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po
index bac013f9..6592574c 100644
--- a/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/cs_CZ/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/kolab-documentation/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/kolab/kolab-documentation/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/index.po
index 41dc8e34..dae9af7f 100644
--- a/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/manage.po
index e1ea9376..493ffbd4 100644
--- a/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/overview.po
index a18e8b04..caa9a729 100644
--- a/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/da_DK/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/kolab-documentation/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/kolab/kolab-documentation/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/index.po
index 49e04809..918e8142 100644
--- a/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/manage.po
index cc445869..5df9ee16 100644
--- a/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/overview.po
index 7bffb546..73d79eff 100644
--- a/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/de_CH/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/kolab-documentation/language/de_CH/)\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po
index e950eef9..cb5214ab 100644
--- a/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Mads <mads@batmads.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:20+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Mads <mads@batmads.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,4 +26,4 @@ msgstr "Aufgaben"
 msgid ""
 "The *Tasks* module helps you organize your daily jobs and ToDo's and will "
 "alert you about upcoming deadlines."
-msgstr ""
+msgstr "Das *Aufgaben*-Modul hilft Ihnen, Ihre täglichen Aufgaben und Pendenzen zu organisieren und meldet Ihnen bevorstehende Fristen. "
diff --git a/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po
index 870bfb6f..39346955 100644
--- a/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Gerd Seyfarth <mail@netsecond.net>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:21+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgstr "Aufgaben verwalten"
 msgid ""
 "All the described functions to manage your tasks are accessible from the "
 "main task view."
-msgstr ""
+msgstr "Alle beschriebenen Funktionen zum Verwalten Ihrer Aufgaben sind in der Hauptaufgabenansicht zugänglich."
 
 #: ../../en_US/_plugins/tasks/manage.rst:13
 msgid "Create new Tasks"
@@ -94,13 +95,13 @@ msgstr ""
 #: ../../en_US/_plugins/tasks/manage.rst:46
 msgid ""
 "``Title``: The title of the task. This is what you will see in the list."
-msgstr ""
+msgstr "``Titel``: Der Titel der Aufgabe. Das ist was Sie in der Liste sehen werden."
 
 #: ../../en_US/_plugins/tasks/manage.rst:47
 msgid ""
 "``Description``: Any text that describes the task. Links and email addresses"
 " will be become clickable."
-msgstr ""
+msgstr "``Beschreibung``: Jeder Text, der die Aufgabe beschreibt. Links und E-Mail-Adressen werden anklickbar."
 
 #: ../../en_US/_plugins/tasks/manage.rst:48
 msgid ""
diff --git a/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po
index f5e78b1c..4bec001e 100644
--- a/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:21+0000\n"
-"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab-documentation/language/de/)\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/index.po
new file mode 100644
index 00000000..258928cb
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/index.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2017-09-23 01:21+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..63b26d14
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..93550543
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/el/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/kolab/kolab-documentation/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/index.po
new file mode 100644
index 00000000..db9e476c
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..356b4288
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..12c9addc
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/en_RO/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Romania) (http://www.transifex.com/kolab/kolab-documentation/language/en_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_RO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/index.po
index 90b3a836..3282539d 100644
--- a/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/index.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/manage.po
index ed6ef356..076d33f6 100644
--- a/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/manage.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/overview.po
index 23ca0acf..ab50044b 100644
--- a/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/overview.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: English (http://www.transifex.com/projects/p/kolab-documentation/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/kolab/kolab-documentation/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/index.po
index 5d89da0b..1ddce556 100644
--- a/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/manage.po
index e87325a6..d7ecdd13 100644
--- a/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/overview.po
index 8a7c92dd..17637aac 100644
--- a/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/es_AR/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/kolab-documentation/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/kolab/kolab-documentation/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/index.po
index 53033336..5b0c13a7 100644
--- a/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/index.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,10 +20,10 @@ msgstr ""
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
-msgstr ""
+msgstr "Tareas"
 
 #: ../../en_US/_plugins/tasks/index.rst:11
 msgid ""
 "The *Tasks* module helps you organize your daily jobs and ToDo's and will "
 "alert you about upcoming deadlines."
-msgstr ""
+msgstr "El módulo *Tareas* le ayuda a organizar sus trabajos diarios y las tareas por hacer y le avisará sobre los próximos plazos."
diff --git a/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/manage.po
index da35738d..79850e33 100644
--- a/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/manage.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,13 +20,13 @@ msgstr ""
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
-msgstr ""
+msgstr "Gestionar tareas"
 
 #: ../../en_US/_plugins/tasks/manage.rst:9
 msgid ""
 "All the described functions to manage your tasks are accessible from the "
 "main task view."
-msgstr ""
+msgstr "Todas las funciones descritas para administrar sus tareas son accesibles desde la vista de tareas principal."
 
 #: ../../en_US/_plugins/tasks/manage.rst:13
 msgid "Create new Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/overview.po
index 0ccb5692..a33b9de3 100644
--- a/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/overview.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab-documentation/language/es/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
-msgstr ""
+msgstr "Información general"
 
 #: ../../en_US/_plugins/tasks/overview.rst:8
 msgid ""
 "The content area of the tasks screen is divided into three areas: the "
 ":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
 "the :ref:`Tasklist Selector <tasklist-lists>`."
-msgstr ""
+msgstr "El área de contenido de la pantalla de tareas se divide en tres áreas: la :ref: `Tasks <tasklist-tasks>`, la :ref: Tags <taskslist-tags>` y la :ref:`Tasklist Selector <tasklist-lists>`."
 
 #: ../../en_US/_plugins/tasks/overview.rst:16
 msgid "The Tasks List"
diff --git a/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/index.po
index b5ba4286..784b3c01 100644
--- a/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/manage.po
index 8c41beaf..066acbcc 100644
--- a/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/overview.po
index dd68e8e9..629211bd 100644
--- a/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/et_EE/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/kolab-documentation/language/et_EE/)\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/kolab/kolab-documentation/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/index.po
index e88c6f1a..21cc29f7 100644
--- a/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po
index 2067b95f..0f2fec82 100644
--- a/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po
index ad1cc28c..d76e6b63 100644
--- a/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/fi_FI/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/kolab-documentation/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/kolab/kolab-documentation/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/index.po
new file mode 100644
index 00000000..f6432b64
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..dcd3dff8
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..c06ff041
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/fr_CH/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Switzerland) (http://www.transifex.com/kolab/kolab-documentation/language/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/index.po
index f7ec5e3c..a68bd1d7 100644
--- a/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/index.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:21+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po
index c072953d..7d037810 100644
--- a/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po
index 567109d7..a7574672 100644
--- a/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-28 00:21+0000\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
 "Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab-documentation/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab-documentation/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/index.po
index a3d56878..34ba9b04 100644
--- a/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/manage.po
index b35eba96..fd858885 100644
--- a/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/overview.po
index c0375556..98af1f82 100644
--- a/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/he/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/kolab-documentation/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/kolab/kolab-documentation/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/index.po
index 02a57e86..53fe3327 100644
--- a/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/manage.po
index c262d786..775e531b 100644
--- a/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/overview.po
index e49e4bd7..3a02d54b 100644
--- a/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/hr/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/kolab-documentation/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/kolab/kolab-documentation/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/index.po
index 340bb16e..68b3e190 100644
--- a/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po
index dea16805..540aec7c 100644
--- a/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po
index 72af4bdc..ec2ff593 100644
--- a/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/hu_HU/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/kolab-documentation/language/hu_HU/)\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/kolab/kolab-documentation/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/index.po
index e9f8506c..09d328b8 100644
--- a/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/manage.po
index 061321a7..10126dad 100644
--- a/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/overview.po
index e03b9619..b6661c41 100644
--- a/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/it_IT/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/kolab-documentation/language/it_IT/)\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/kolab/kolab-documentation/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/index.po
index c8cc47c7..16d889a2 100644
--- a/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po
index 75a49cdf..e2f0fe34 100644
--- a/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po
index afe8332e..e2fe76f2 100644
--- a/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/ja_JP/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/kolab-documentation/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/kolab/kolab-documentation/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/index.po
new file mode 100644
index 00000000..e2f6d4d0
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..5c0671eb
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..1a4fec8c
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ko/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2015-01-11 21:47+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Korean (http://www.transifex.com/kolab/kolab-documentation/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/index.po
new file mode 100644
index 00000000..c6710325
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..040ed065
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..c6bcc670
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/ko_KR/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/kolab/kolab-documentation/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po
index 511d697f..734cb267 100644
--- a/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po
index 186a2aa2..5a25a218 100644
--- a/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po
index 5a49c7f3..1cee95db 100644
--- a/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/ku_IQ/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/kolab-documentation/language/ku_IQ/)\n"
+"Language-Team: Kurdish (Iraq) (http://www.transifex.com/kolab/kolab-documentation/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/index.po
new file mode 100644
index 00000000..0cacc2c0
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..437dab09
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..8b4ec828
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/lv/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/kolab/kolab-documentation/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po
index 18b0e46e..4fb310de 100644
--- a/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
-msgstr ""
+msgstr "Taken"
 
 #: ../../en_US/_plugins/tasks/index.rst:11
 msgid ""
diff --git a/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po
index ed518767..0b436886 100644
--- a/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po
index 571b317c..d2455dc7 100644
--- a/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab-documentation/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab-documentation/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po
index 09fa0b66..ac2c05cc 100644
--- a/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po
index a0cf266c..c6e08fc0 100644
--- a/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po
index 8503ad36..2b0b8524 100644
--- a/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/kolab-documentation/language/pl_PL/)\n"
+"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/index.po
index 94074a54..633f71a2 100644
--- a/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po
index 80c6cf47..2c508ad0 100644
--- a/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po
index 705422d0..68b5bc07 100644
--- a/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/pt_BR/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/kolab-documentation/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/kolab/kolab-documentation/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/index.po
new file mode 100644
index 00000000..3dc11359
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..fe91261d
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..19e5ff33
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/pt_PT/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/kolab/kolab-documentation/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/index.po
index d9275d35..49c1d79f 100644
--- a/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/manage.po
index 15ca7053..20b5177e 100644
--- a/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/overview.po
index 2121380d..d72f2992 100644
--- a/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/ro/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/kolab-documentation/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/kolab/kolab-documentation/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/index.po
index 945b1386..fda2c696 100644
--- a/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po
index 3a3305a9..05aaaebe 100644
--- a/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po
index dc4fa6a3..ca9b39ad 100644
--- a/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/ru_RU/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/kolab-documentation/language/ru_RU/)\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/kolab/kolab-documentation/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/index.po
index 552806f7..7927ab37 100644
--- a/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/manage.po
index d7d1a3c1..70d3b594 100644
--- a/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/overview.po
index f97afd9b..8cbd13bb 100644
--- a/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/sk/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/kolab-documentation/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/kolab/kolab-documentation/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/index.po
new file mode 100644
index 00000000..bc93dc00
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..cb77bfca
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..bd1ecf74
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/sl_SI/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-28 21:53+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Slovenian (http://www.transifex.com/kolab/kolab-documentation/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/index.po
index 312052bc..86957ef4 100644
--- a/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/index.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:08+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/manage.po
index 46c8c44e..45a72d01 100644
--- a/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/manage.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2015-03-24 11:08+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/overview.po
index bce34c1b..9bc3f949 100644
--- a/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/overview.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/kolab-documentation/language/sv/)\n"
+"PO-Revision-Date: 2017-09-22 02:42+0000\n"
+"Last-Translator: Thomas Bruederli <roundcube@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/kolab/kolab-documentation/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,7 +80,7 @@ msgstr ""
 
 #: ../../en_US/_plugins/tasks/overview.rst:50
 msgid "Tags"
-msgstr ""
+msgstr "Taggar"
 
 #: ../../en_US/_plugins/tasks/overview.rst:52
 msgid ""
diff --git a/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/index.po
new file mode 100644
index 00000000..08fe6277
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..9cc2f9cc
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..17c1f189
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/th_TH/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-11-27 23:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai (http://www.transifex.com/kolab/kolab-documentation/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/index.po
new file mode 100644
index 00000000..21fe3da9
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/index.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/tasks/index.rst:9
+msgid "Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/index.rst:11
+msgid ""
+"The *Tasks* module helps you organize your daily jobs and ToDo's and will "
+"alert you about upcoming deadlines."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/manage.po
new file mode 100644
index 00000000..99c35d7f
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/manage.po
@@ -0,0 +1,323 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/tasks/manage.rst:7
+msgid "Managing Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:9
+msgid ""
+"All the described functions to manage your tasks are accessible from the "
+"main task view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:13
+msgid "Create new Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:18
+msgid "**The New Task Dialog**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:16
+msgid ""
+"Click the *New task* button in the toolbar to get an empty dialog where you "
+"enter the tasks properties like title, description, start/due dates and "
+"reminder settings. Click *Save* to finally add it to the selected task list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:27
+msgid "**Quick Entry**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:21
+msgid ""
+"The text box in the centre of the toolbar area lets you add new tasks very "
+"fast by simply entering a title and then press <Enter> on the keyboard. "
+"Tasks will be created in the currently selected list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:25
+msgid ""
+"Begin the quick entry with a date or time description like \"Tomorrow\" or "
+"\"Monday at 16:00\" to directly assign a due date to the task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:32
+msgid "Edit Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:35
+msgid "The Edit Dialog"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:37
+msgid ""
+"When clicking a task item in list a dialog showing its details is displayed."
+" Clicking the Edit button in that dialog opens the form to edit all "
+"properties of the selected task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:40
+msgid ""
+"The edit form is divided into different section which can be switched using "
+"the tabs on top of the dialog:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:42
+msgid "**Summary**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:44
+msgid ""
+"This general section has text fields and selectors for various properties. "
+"Here’s a description of all the possible values:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:46
+msgid ""
+"``Title``: The title of the task. This is what you will see in the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:47
+msgid ""
+"``Description``: Any text that describes the task. Links and email addresses"
+" will be become clickable."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:48
+msgid ""
+"``Tags``: A list of tags assigned to this task. Add one by typing to the "
+"text box and hit <Enter>."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:49
+msgid "``Start``: The date/time, the task is supposed to be worked on."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:50
+msgid ""
+"``Due``: The date/time this job is due. Define a time when setting a "
+"reminder for this task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:51
+msgid ""
+"``Reminder``: This will pop up with an notification at a the specified time "
+"before the task is due."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:52
+msgid ""
+"``Complete``: The completeness state of a task in percent. Use the slider or"
+" enter a number."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:53
+msgid ""
+"``Tasklist``: The list the task is saved in. Change it to move an event from"
+" one list to another."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:58
+msgid "**Attachments**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:60
+msgid ""
+"Append files and documents related to this task directly as attachments. "
+"Switch to the Attachments tab to upload files to the current task or to "
+"remove them again. Adding files works pretty much the same as "
+":ref:`attaching them to email messages <mail-compose-attachments>`: first "
+"select a file from your local disk and click *Upload* in order to attach it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:65
+msgid ""
+"Don't forget to finally save the changes by clicking *Save* in the edit "
+"dialog. Switching back and forth the tabs will not yet save the data."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:72
+msgid "Assign Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:74
+msgid ""
+"Tags help you organize your tasks in the list view. Open the :ref:`Edit "
+"Dialog <tasklist-edit-task>` and enter tags into the according text box:"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:79
+msgid ""
+"Append a tag by hitting <Enter> and continue typing to add more. While "
+"typing, a suggestion of already used tags will be shown. Use the arrow keys "
+"on the keyboard to select one and press <Enter> to select."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:82
+msgid "Remove tags with a click on the *Remove* icon."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:84
+msgid "**Drag & Drop Tags**"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:86
+msgid ""
+"Existing tags listed in the tags box on the left can also be assigned to "
+"tasks directly in the list view by simply dragging the tag from the box and "
+"drop it on a task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:93
+msgid "Set Due Dates"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:95
+msgid ""
+"Assign due dates to your tasks to not miss your deadlines and to enable "
+"reminder notifications for them. The due dates with time can be entered in "
+"the :ref:`Edit Dialog <tasklist-edit-task>`. When entering the input field, "
+"a small calendar widget will help you to quickly select a date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:99
+msgid ""
+"Due dates can also be entered or changed directly in the list view without "
+"going to the edit dialog. Click the due date or the \"no date\" area on the "
+"right end of a task bar and select a date from the calendar widget. The "
+"change will be saved immediately."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:107
+msgid "Mark Tasks as Complete"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:109
+msgid ""
+"In the :ref:`tasklist-edit-task` section we learned how to set a percentage "
+"value for a task's completeness. Until a task isn't fully completed, the "
+"percentage is displayed as a think horizontal line in the list view."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:113
+msgid ""
+"In order to mark a task as complete, simply click the checkbox in the list "
+"view. The task is now grayed out and moved to the bottom of the list. After "
+"some time or when refreshing the list, completed tasks will be removed from "
+"the view. You can still find them with the *Complete* quick filter. Uncheck "
+"the box to bring it back to the normal list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:120
+msgid "Organize Tasks in Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:122
+msgid ""
+"For bigger jobs or entire projects, tasks can be divided into subtasks and "
+"organized hierarchically to visualize dependencies."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:126
+msgid "Create a Subtask"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:132
+#: ../../en_US/_plugins/tasks/manage.rst:172
+msgid ""
+"Open the options menu of a task from the arrow icon on the far right of the "
+"task bar."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:133
+msgid "Select *Add subtask*"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:134
+msgid ""
+"Enter the subtask properties in the :ref:`Edit Dialog <tasklist-edit-task>`"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:135
+msgid "Press *Save* to insert it"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:141
+msgid "Re-organize Groups"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:143
+msgid ""
+"The hierarchical nesting of tasks and subtasks can be changed at any time. "
+"Simple grab a task with the mouse and drop onto another one to make it a "
+"subtask. This works for entire subtrees equally well. While dragging, a "
+"possible drop target is highlighted when moving over it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:147
+msgid ""
+"Drop a task onto the small bar on top of the tasks list to make it a main "
+"task again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:149
+msgid ""
+"If you organize your tasks in different lists, dropping a task onto a task "
+"list in the box on the left moves it (and all child tasks) to that "
+"particular list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:157
+msgid "Get Notifications"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:159
+msgid ""
+"While logged in to the webmail, reminders about soon-to-be due tasks will be"
+" displayed with pop-up boxes at the specified time before the task is due. "
+"You can specify if you want to see reminders for every task list "
+"individually. Enable or disable reminders in :ref:`Task List Settings "
+"<tasklist-edit-list>` from the :ref:`tasklist-lists`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:163
+msgid ""
+"Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in "
+"the calendar section."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:167
+msgid "Delete Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:169
+msgid ""
+"Usually finished tasks are marked as complete. But there are still "
+"situations where you might want to actually delete a task."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:173
+msgid "Select *Delete*."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/manage.rst:174
+msgid "Click *Delete* again in the confirmation dialog."
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/overview.po
new file mode 100644
index 00000000..a1b7211a
--- /dev/null
+++ b/plugins/tasklist/helpdocs/locale/tr/LC_MESSAGES/overview.po
@@ -0,0 +1,198 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Kolab Documentation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-26 23:28+0100\n"
+"PO-Revision-Date: 2014-12-11 03:41+0000\n"
+"Last-Translator: Torsten Grote <grote@kolabsys.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/kolab/kolab-documentation/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../en_US/_plugins/tasks/overview.rst:6
+msgid "Overview"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:8
+msgid ""
+"The content area of the tasks screen is divided into three areas: the "
+":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
+"the :ref:`Tasklist Selector <tasklist-lists>`."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:16
+msgid "The Tasks List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:18
+msgid ""
+"The main content are lists the task items that match the current selection "
+"of active lists, filters and tags. The listed tasks are sorted by due date "
+"(ascending) and completed ones move to the bottom."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:25
+msgid ""
+"Tasks can be organized hierarchically and the list appears like a tree "
+"structure. A small arrow icon on the left side of a task bar indicates "
+"subordinated tasks and expands or collapses the tree upon click."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:29
+msgid ""
+"Some basic editing like flagging, assigning a due date as well as completing"
+" tasks can directly be done in the list by clicking the checkbox, the flag "
+"icon or the date selector."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:32
+msgid ""
+"A single click anywhere else on a task bar displays all details in a dialog "
+"box. Hit <Esc> on the keyboard or click the close icon to hide it again."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:35
+msgid "Double-clicks open the clicked task item for full detail editing."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:39
+msgid "Control the List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:42
+msgid "Quick Filters"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:44
+msgid ""
+"The selection your tasks displayed on the screen can be refined in various "
+"ways. Use the quick filters above the list to reduce the listed tasks "
+"according to their status or due date."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:50
+msgid "Tags"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:52
+msgid ""
+"The tags list on the left is another way to display a selection of tasks. "
+"Click a tag to only display tasks with this tag assigned. Click it again to "
+"show all. Hold down the <Shift> key on the the keyboard to select mutliple "
+"tags and further reduce the selection."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:57
+#: ../../en_US/_plugins/tasks/overview.rst:83
+msgid "Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:59
+msgid ""
+"The checkboxes in the :ref:`tasklist-lists` box control whether tasks from "
+"the according list are currently displayed. Use the *Quick View* icon "
+"|quickview| in the list to quickly reduce the view to tasks from a single "
+"list. This can also be used when the according list isn't activated. Click "
+"it again to turn off quick view mode and return to regular display of active"
+" lists."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:68
+msgid "Searching Tasks"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:70
+msgid ""
+"The search box above the calendar view lets you quickly get a list of events"
+" matching the entered keyword in either the title or the description text. "
+"Enter the search term into the box and press <Enter> on your keyboard to "
+"start the search."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:73
+msgid ""
+"After searching, you can still use the filters and tags as explained above "
+"to hide some results."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:75
+msgid ""
+"Reset the search by clicking the *Reset search* icon on the right border of "
+"the search box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:85
+msgid ""
+"Organize your tasks in various lists. All of your personal task lists as "
+"well as those shared by others are listed in the box in the lower left area "
+"of the screen."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:88
+msgid ""
+"You can create any number of lists to store and manage all your tasks and "
+"name them individually."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:92
+msgid "Create a Task List"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:94
+msgid "Click the + icon in the tasklists box footer."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:95
+msgid "In the dialog, give the new list a unique name."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:96
+msgid "Click *Save* to create it."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:101
+msgid "Edit List Names and Settings"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:103
+#: ../../en_US/_plugins/tasks/overview.rst:111
+msgid "Select the task list to edit by clicking the name in the box."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:104
+msgid ""
+"Click the gear icon in the box footer and select *Edit* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:105
+msgid "Adjust name or reminders settings in the edit dialog."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:106
+msgid "Click *Save* to finally update the list."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:109
+msgid "Remove entire Task Lists"
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:112
+msgid ""
+"Click the gear icon in the box footer and select *Remove* from the options "
+"menu."
+msgstr ""
+
+#: ../../en_US/_plugins/tasks/overview.rst:113
+msgid ""
+"After a confirmation dialog, the selected list with all its tasks will be "
+"deleted. Caution: This action cannot be undone!"
+msgstr ""
diff --git a/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/index.po
index a4b8eb64..c2a7b220 100644
--- a/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po
index 601d7263..14aca498 100644
--- a/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po
index 6cfab9d8..bf92c217 100644
--- a/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/kolab-documentation/language/tr_TR/)\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/kolab/kolab-documentation/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/index.po
index 46c003df..4947f134 100644
--- a/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/index.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/manage.po
index b6f64edf..73f2a317 100644
--- a/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/manage.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
diff --git a/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/overview.po
index a3028928..7909a11a 100644
--- a/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/uk/LC_MESSAGES/overview.po
@@ -10,12 +10,12 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/kolab-documentation/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/kolab/kolab-documentation/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
diff --git a/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/index.po
index 40f3660d..cf69e389 100644
--- a/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/manage.po
index a8234689..fd74417d 100644
--- a/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/overview.po
index 2a546cbe..378d7fb6 100644
--- a/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/vi/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/kolab-documentation/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/kolab/kolab-documentation/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/index.po
index f86283d4..de026e17 100644
--- a/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po
index b722a8b7..2a3e171b 100644
--- a/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po
index 32ae3c93..2db75e98 100644
--- a/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/zh_CN/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/kolab/kolab-documentation/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/index.po b/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/index.po
index 2c350477..03ba6d20 100644
--- a/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/index.po
+++ b/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/index.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po b/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po
index d6ef0acb..b1fec389 100644
--- a/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po
+++ b/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/manage.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po b/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po
index f6a2c4fc..3def0999 100644
--- a/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po
+++ b/plugins/tasklist/helpdocs/locale/zh_TW/LC_MESSAGES/overview.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
 "PO-Revision-Date: 2014-11-27 23:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/kolab-documentation/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/kolab/kolab-documentation/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/tasklist/helpdocs/po/invitations.pot b/plugins/tasklist/helpdocs/po/invitations.pot
new file mode 100644
index 00000000..31daf8fb
--- /dev/null
+++ b/plugins/tasklist/helpdocs/po/invitations.pot
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015, roundcube.net
+# This file is distributed under the same license as the Roundcube Webmail Help package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Roundcube Webmail Help 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-12 11:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../en_US/_plugins/tasklist/invitations.rst:8
+msgid "Handle Task Assignments"
+msgstr ""
+
+#: ../../en_US/_plugins/tasklist/invitations.rst:10
+msgid "You can assign other people to a task. This will send out invitation emails to all assignees with the task data attached. That allows one to directly accept or decline the invitation."
+msgstr ""
+
+#: ../../en_US/_plugins/tasklist/invitations.rst:14
+msgid "Chapter :ref:`calendar-invitations` describes how email invitations work for event participants. The same applies for task assignees."
+msgstr ""
+
diff --git a/plugins/tasklist/localization/bg.inc b/plugins/tasklist/localization/bg.inc
new file mode 100644
index 00000000..20bc4af5
--- /dev/null
+++ b/plugins/tasklist/localization/bg.inc
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['navtitle'] = 'Задачи';
+$labels['lists'] = 'Списъци със задачи';
+$labels['list'] = 'Списък със задачи';
+$labels['tags'] = 'Етикети';
+$labels['tasklistsubscribe'] = 'Постоянен списък';
+$labels['listsearchresults'] = 'Налични списъци';
+$labels['findlists'] = 'Намери списъци със задачи ...';
+$labels['notasklistsfound'] = 'Не бяха открити списъци със задачи ...';
+$labels['nrtasklistsfound'] = 'Бяха намерени $nr списъка';
+$labels['removelist'] = 'Премахване от списъка';
+$labels['showcaldavurl'] = 'Покажи CalDAV URL адрес';
+$labels['caldavurldescription'] = 'Копирайте <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> URL адреса в клиентско приложение (например Evolution или Mozilla Thunderbird), за да синхронизирате този списък със задачи на вашият компютър или мобилно устройство.';
+$labels['newtask'] = 'Нова Задача';
+$labels['createtask'] = 'Създаване на задача <Enter>';
+$labels['createnewtask'] = 'Създаване на нова Задача (напр. Понеделник, На работа)';
+$labels['createfrommail'] = 'Запази като задача';
+$labels['printtitle'] = 'Принтиране на задачи';
+$labels['newtask'] = 'Нова Задача';
diff --git a/plugins/tasklist/localization/bg_BG.inc b/plugins/tasklist/localization/bg_BG.inc
index 39a970c3..36d23a9b 100644
--- a/plugins/tasklist/localization/bg_BG.inc
+++ b/plugins/tasklist/localization/bg_BG.inc
@@ -7,26 +7,172 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 $labels['navtitle'] = 'Задачи';
+$labels['lists'] = 'Списъци със задачи';
+$labels['list'] = 'Списък със задачи
+';
+$labels['tags'] = 'Етикети';
+$labels['export'] = 'Извличане';
+$labels['exporttitle'] = 'Извличане към iCalendar';
+$labels['exportattachments'] = 'С прикачени файлове';
+$labels['tasklistsubscribe'] = 'Постоянен списък';
+$labels['listsearchresults'] = 'Налични списъци със задачи';
+$labels['findlists'] = 'Намери списъци със задачи...';
+$labels['searchterms'] = 'Търсене за';
+$labels['notasklistsfound'] = 'Не бяха намерени списъци със задачи';
+$labels['nrtasklistsfound'] = 'Намерени са $nr списъка със задачи';
+$labels['removelist'] = 'Премахни от списъка';
+$labels['showcaldavurl'] = 'Покажи CalDAV URL адреса';
+$labels['caldavurldescription'] = 'Копирайте този адрес в <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> приложението, което използвате (напр. Evolution или Mozilla Thunderbird), за да синхронизирате този конкретен списък със задачи с вашият компютър или мобилно устройство.';
+$labels['newtask'] = 'Нова задача';
+$labels['createtask'] = 'Създаване на задача <Enter>';
+$labels['createnewtask'] = 'Запазване като задача';
+$labels['createfrommail'] = 'Запази като задача';
+$labels['printtitle'] = 'Печат на задачите';
 $labels['printdescriptions'] = 'Печат на описанията';
+$labels['mark'] = 'Маркиране';
+$labels['unmark'] = 'Демаркиране';
 $labels['edit'] = 'Промяна';
+$labels['delete'] = 'Изтриване';
+$labels['title'] = 'Заглавие';
 $labels['description'] = 'Описание';
+$labels['datetime'] = 'Due';
+$labels['duetime'] = 'Due time';
 $labels['start'] = 'Начало';
+$labels['starttime'] = 'Начален час';
 $labels['alarms'] = 'Напомняне';
+$labels['repeat'] = 'Повторения';
+$labels['links'] = 'Цикличност';
 $labels['status'] = 'Статус';
+$labels['status-needs-action'] = 'Нужно е действие';
+$labels['status-in-process'] = 'В процес';
+$labels['status-completed'] = 'Завършен';
+$labels['status-cancelled'] = 'Отхвърлен';
+$labels['assignedto'] = 'Assigned to';
+$labels['created'] = 'Създадено в';
+$labels['changed'] = 'Последна промяна';
+$labels['taskoptions'] = 'Опции';
+$labels['all'] = 'All';
+$labels['flagged'] = 'Flagged';
+$labels['complete'] = 'Complete';
+$labels['completeness'] = 'Progress';
+$labels['overdue'] = 'Закъснение';
 $labels['today'] = 'Днес';
 $labels['tomorrow'] = 'Утре';
+$labels['next7days'] = 'Следващите 7 дни';
+$labels['later'] = 'Късно';
+$labels['assigned'] = 'Assigned';
+$labels['assignedtitle'] = 'Tasks you assigned to others';
+$labels['mytasks'] = 'Моите задачи';
+$labels['mytaskstitle'] = 'Задачи, назначени към мен';
+$labels['nodate'] = 'no date';
 $labels['removetag'] = 'Изтриване';
+$labels['removelink'] = 'Remove email reference';
+$labels['auto'] = 'Auto';
+$labels['newtask'] = 'Нова задача';
+$labels['edittask'] = 'Edit Task';
 $labels['save'] = 'Запис';
 $labels['cancel'] = 'Отказ';
+$labels['saveandnotify'] = 'Save and Notify';
+$labels['addsubtask'] = 'Add subtask';
+$labels['deletetask'] = 'Delete task';
+$labels['deletethisonly'] = 'Delete this task only';
+$labels['deletewithchilds'] = 'Delete with all subtasks';
+$labels['taskactions'] = 'Task options...';
 $labels['tabsummary'] = 'Заглавие';
+$labels['tabrecurrence'] = 'Повтаряне';
+$labels['tabassignments'] = 'Assignments';
 $labels['tabattachments'] = 'Прикрепени файлове';
 $labels['tabsharing'] = 'Споделяне';
+$labels['editlist'] = 'Редактиране на списък';
+$labels['createlist'] = 'Добавяне на списък';
+$labels['listactions'] = 'List options...';
 $labels['listname'] = 'Име';
+$labels['showalarms'] = 'Показвай напомняния';
+$labels['import'] = 'Import';
+$labels['viewactions'] = 'View actions';
+$labels['focusview'] = 'View only this list';
+$labels['on'] = 'on';
+$labels['at'] = 'at';
+$labels['this'] = 'this';
+$labels['next'] = 'next';
 $labels['savingdata'] = 'Запазване на данни...';
+$labels['errorsaving'] = 'Failed to save data.';
+$labels['notasksfound'] = 'Няма намерени задачи, отговарящи на този критерии';
+$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
+$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
+$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
+$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
+$labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
+$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
+$labels['changetaskconfirm'] = 'Update task';
+$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
+$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
+$labels['quickaddinput'] = 'New task date and title';
+$labels['arialabelquickaddbox'] = 'Quick add new task';
+$labels['arialabelsearchform'] = 'Task search form';
+$labels['arialabelquicksearchbox'] = 'Task search input';
+$labels['arialabellistsearchform'] = 'Tasklists search form';
+$labels['arialabeltaskselector'] = 'List mode';
+$labels['arialabeltasklisting'] = 'Tasks listing';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['attendee'] = 'Assignee';
 $labels['role'] = 'Роля';
+$labels['availability'] = 'Avail.';
 $labels['confirmstate'] = 'Статус';
+$labels['addattendee'] = 'Add assignee';
 $labels['roleorganizer'] = 'Организатор';
 $labels['rolerequired'] = 'Задължителен';
 $labels['roleoptional'] = 'По избор';
+$labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Observer';
 $labels['sendinvitations'] = 'Изпращане на покани';
+$labels['sendnotifications'] = 'Notify assignees about modifications';
+$labels['sendcancellation'] = 'Notify assignees about task cancellation';
+$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
+$labels['itipupdatesubject'] = '"$title" has been updated';
+$labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
+$labels['saveintasklist'] = 'save in ';
+$labels['taskhistory'] = 'История';
+$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
+$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegated'] = "\$sender has delegated the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender has delegated the following task to you:\n\n*\$title*\n\nDue: \$date";
+$labels['attendeeaccepted'] = 'Assignee has accepted';
+$labels['attendeetentative'] = 'Assignee has tentatively accepted';
+$labels['attendeedeclined'] = 'Assignee has declined';
+$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
+$labels['attendeein-process'] = 'Assignee is in-process';
+$labels['attendeecompleted'] = 'Assignee has completed';
+$labels['acceptinvitation'] = 'Do you accept this assignment?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Notification sent to assignees';
+$labels['errornotifying'] = 'Failed to send notifications to task assignees';
+$labels['removefromcalendar'] = 'Remove from my tasks';
+$labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr повече...';
+$labels['savetotasklist'] = 'Запазване в задачи';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Коментар';
+$labels['errorimportingtask'] = 'Failed to import task(s)';
+$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
+$labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importerror'] = 'Възникна грешка при внасянето на събития';
+$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
+$labels['nowritetasklistfound'] = 'Не беше намерен списък, в който да запазите задачата';
+$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
+$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
+$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
+$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'The task has been deleted successfully.';
diff --git a/plugins/tasklist/localization/ca_ES.inc b/plugins/tasklist/localization/ca_ES.inc
index d8e8d20a..f9b41375 100644
--- a/plugins/tasklist/localization/ca_ES.inc
+++ b/plugins/tasklist/localization/ca_ES.inc
@@ -10,6 +10,9 @@ $labels['navtitle'] = 'Tasques';
 $labels['lists'] = 'Llistes de tasques';
 $labels['list'] = 'Llista de tasques';
 $labels['tags'] = 'Etiquetes';
+$labels['export'] = 'Exporta';
+$labels['exporttitle'] = 'Exporta a iCalendari';
+$labels['exportattachments'] = 'Amb fitxers adjunts';
 $labels['tasklistsubscribe'] = 'Llista permanentment';
 $labels['listsearchresults'] = 'Llistes de tasques disponibles';
 $labels['findlists'] = 'Cerca llistes de tasques...';
@@ -43,6 +46,7 @@ $labels['status-cancelled'] = 'Cancel·lat';
 $labels['assignedto'] = 'Assignat a';
 $labels['created'] = 'Creat';
 $labels['changed'] = 'Darrera modificació';
+$labels['taskoptions'] = 'Opcions';
 $labels['all'] = 'Tots';
 $labels['flagged'] = 'Destacat';
 $labels['complete'] = 'Completat';
@@ -60,7 +64,6 @@ $labels['nodate'] = 'sense data';
 $labels['removetag'] = 'Suprimeix';
 $labels['removelink'] = 'Remove email reference';
 $labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Detalls';
 $labels['newtask'] = 'Nova tasca';
 $labels['edittask'] = 'Edita la tasca';
 $labels['save'] = 'Desa';
@@ -90,21 +93,84 @@ $labels['this'] = 'aquest';
 $labels['next'] = 'següent';
 $labels['savingdata'] = 'S\'estan desant les dades...';
 $labels['errorsaving'] = 'No s\'han pogut desar les dades.';
+$labels['notasksfound'] = 'No tasks found for the given criteria';
+$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
+$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
+$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
+$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
+$labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
+$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
+$labels['changetaskconfirm'] = 'Update task';
+$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
+$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
+$labels['quickaddinput'] = 'New task date and title';
+$labels['arialabelquickaddbox'] = 'Quick add new task';
+$labels['arialabelsearchform'] = 'Task search form';
+$labels['arialabelquicksearchbox'] = 'Task search input';
+$labels['arialabellistsearchform'] = 'Tasklists search form';
+$labels['arialabeltaskselector'] = 'List mode';
+$labels['arialabeltasklisting'] = 'Tasks listing';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['attendee'] = 'Assignee';
 $labels['role'] = 'Rol';
 $labels['availability'] = 'Disp.';
 $labels['confirmstate'] = 'Estat';
+$labels['addattendee'] = 'Add assignee';
 $labels['roleorganizer'] = 'Organitzador';
 $labels['rolerequired'] = 'Obligatori';
 $labels['roleoptional'] = 'Opcional';
 $labels['rolechair'] = 'President';
 $labels['rolenonparticipant'] = 'Observer';
 $labels['sendinvitations'] = 'Envia invitacions';
+$labels['sendnotifications'] = 'Notify assignees about modifications';
+$labels['sendcancellation'] = 'Notify assignees about task cancellation';
+$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
 $labels['itipupdatesubject'] = '"$title" ha estat actualitzat';
-$labels['itipcancelsubject'] = '"$title" ha estat cancel·lat';
+$labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
+$labels['saveintasklist'] = 'save in ';
+$labels['taskhistory'] = 'Historial';
+$labels['objectchangelog'] = 'Canvia historial';
+$labels['objectdiffnotavailable'] = 'No és possible comparar les revisions seleccionades';
+$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
+$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegated'] = "\$sender has delegated the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender has delegated the following task to you:\n\n*\$title*\n\nDue: \$date";
+$labels['attendeeaccepted'] = 'Assignee has accepted';
+$labels['attendeetentative'] = 'Assignee has tentatively accepted';
+$labels['attendeedeclined'] = 'Assignee has declined';
+$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
+$labels['attendeein-process'] = 'Assignee is in-process';
+$labels['attendeecompleted'] = 'Assignee has completed';
+$labels['acceptinvitation'] = 'Do you accept this assignment?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
 $labels['itipcomment'] = 'Comentari de la invitació/notificació';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Notification sent to assignees';
+$labels['errornotifying'] = 'Failed to send notifications to task assignees';
+$labels['removefromcalendar'] = 'Remove from my tasks';
+$labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr més...';
-$labels['delegatedto'] = 'Delegat a:';
-$labels['delegatedfrom'] = 'Delegat de:';
+$labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comentari';
+$labels['rsvpcomment'] = 'Comentari';
+$labels['errorimportingtask'] = 'Failed to import task(s)';
+$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
+$labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importerror'] = 'Hi ha hagut un error mentre s\'importava';
+$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
+$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
+$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
+$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
 $labels['attendeupdateesuccess'] = 'L\'estat del participant ha estat actualitzat correctament';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
 $labels['itipinvalidrequest'] = 'Aquesta invitació ja no és vàlida';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'The task has been deleted successfully.';
diff --git a/plugins/tasklist/localization/cs_CZ.inc b/plugins/tasklist/localization/cs_CZ.inc
index 031c09aa..69dda24b 100644
--- a/plugins/tasklist/localization/cs_CZ.inc
+++ b/plugins/tasklist/localization/cs_CZ.inc
@@ -10,6 +10,10 @@ $labels['navtitle'] = 'Úkoly';
 $labels['lists'] = 'Seznamy úkolů';
 $labels['list'] = 'Seznam úkolů';
 $labels['tags'] = 'Značky';
+$labels['export'] = 'Uložit jako ICS';
+$labels['exporttitle'] = 'Uložit jako iCalendar';
+$labels['exportattachments'] = 'S přílohami';
+$labels['currentview'] = 'Nynější pohled';
 $labels['tasklistsubscribe'] = 'Ukazovat seznam trvale';
 $labels['listsearchresults'] = 'Dostupné seznamy úkolů';
 $labels['findlists'] = 'Najít seznamy úkolů...';
@@ -17,10 +21,13 @@ $labels['searchterms'] = 'Hledané výrazy';
 $labels['notasklistsfound'] = 'Nenalezeny žádné seznamy úkolů';
 $labels['nrtasklistsfound'] = '$nr seznamů úkolů nalezeno';
 $labels['removelist'] = 'Odstranit ze seznamu';
+$labels['showcaldavurl'] = 'Ukázat adresu (URL) CalDAV';
+$labels['caldavurldescription'] = 'Zkopírujte tuto adresu do aplikace <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> klienta (např. Evolution nebo Mozilla Thunderbird) pro úplné synchronizování tohoto seznamu úkolů s vaším počítačem nebo mobilním zařízením.';
 $labels['newtask'] = 'Nový úkol';
 $labels['createtask'] = 'Vytvořit úkol <Enter>';
 $labels['createnewtask'] = 'Vytvořit nový úkol (např. Sobota, posekat trávník)';
 $labels['createfrommail'] = 'Uložit jako úkol';
+$labels['printtitle'] = 'Vytisknout úkoly';
 $labels['printdescriptions'] = 'Vytisknout popisy';
 $labels['mark'] = 'Označit';
 $labels['unmark'] = 'Odznačit';
@@ -43,6 +50,7 @@ $labels['status-cancelled'] = 'Zrušeno';
 $labels['assignedto'] = 'Přiděleno';
 $labels['created'] = 'Vytvořeno';
 $labels['changed'] = 'Naposledy změněno';
+$labels['taskoptions'] = 'Volby';
 $labels['all'] = 'Všechny';
 $labels['flagged'] = 'Zatrženo';
 $labels['complete'] = 'Dokončeno';
@@ -60,7 +68,6 @@ $labels['nodate'] = 'žádné datum';
 $labels['removetag'] = 'Odstranit';
 $labels['removelink'] = 'Odstranit odkaz na e-mail';
 $labels['auto'] = 'Automaticky';
-$labels['taskdetails'] = 'Podrobnosti';
 $labels['newtask'] = 'Nový úkol';
 $labels['edittask'] = 'Upravit úkol';
 $labels['save'] = 'Uložit';
@@ -88,10 +95,13 @@ $labels['on'] = 'na';
 $labels['at'] = 'v';
 $labels['this'] = 'tento';
 $labels['next'] = 'další';
+$labels['yes'] = 'ano';
 $labels['savingdata'] = 'Ukládají se data...';
 $labels['errorsaving'] = 'Nepodařilo se uložit data.';
 $labels['notasksfound'] = 'Nebyly nalezeny žádné úkoly odpovídající zadaným hlediskům';
 $labels['invalidstartduedates'] = 'Datum začátku nesmí být větší než datum vyřízení.';
+$labels['invalidstartduetimes'] = 'Datum začátku a dokončení musí buď oba nebo žádný uvádět čas.';
+$labels['recurrencerequiresdate'] = 'Opakující se úkoly vyžadují buďto datum zahájení nebo termín splnění.';
 $labels['deletetasktconfirm'] = 'Opravdu chcete smazat tento úkol?';
 $labels['deleteparenttasktconfirm'] = 'Opravdu chcete smazat tento úkol a všechny jeho podúkoly?';
 $labels['deletelistconfirm'] = 'Opravdu chcete smazat tento seznam se všemi jeho úkoly?';
@@ -107,6 +117,7 @@ $labels['arialabelquicksearchbox'] = 'Zadání hledání úkolu';
 $labels['arialabellistsearchform'] = 'Hledání seznamů úkolů';
 $labels['arialabeltaskselector'] = 'Režim seznamu';
 $labels['arialabeltasklisting'] = 'Seznam úkolů';
+$labels['arialabelsortmenu'] = 'Volby pro třídění úkolů';
 $labels['attendee'] = 'Pověřenec';
 $labels['role'] = 'Role';
 $labels['availability'] = 'Dost.';
@@ -121,13 +132,21 @@ $labels['sendinvitations'] = 'Poslat pozvánky';
 $labels['sendnotifications'] = 'Uvědomit pověřence o změnách';
 $labels['sendcancellation'] = 'Uvědomit pověřence o zrušení úkolu';
 $labels['invitationsubject'] = 'Byl(a) jste přidělen(a) k "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDokdy: \$date\n\nPřiděleno: \$attendees\n\nPodrobnosti o úkolu najdete v přiloženém souboru typu iCalendar. Můžete si ho nahrát do programu na úkoly.";
 $labels['itipupdatesubject'] = 'Událost "$title" byla aktualizována';
 $labels['itipupdatesubjectempty'] = 'Úkol, který se vás týká, byl aktualizován';
 $labels['itipupdatemailbody'] = "*\$title*\n\nDokdy: \$date\n\nPřiděleno: \$attendees\n\nAktualizované podrobnosti o úkolu najdete v přiloženém souboru typu iCalendar. Můžete si ho nahrát do programu na úkoly.";
 $labels['itipcancelsubject'] = 'Událost "$title" byla zrušena';
 $labels['itipcancelmailbody'] = "*\$title*\n\nDokdy: \$date\n\nPřiděleno: \$attendees\n\nÚkol byl zrušen \$organizer.\n\nAktualizované podrobnosti o úkolu najdete v přiloženém souboru typu iCalendar.";
 $labels['saveintasklist'] = 'uložit do';
+$labels['taskhistory'] = 'Historie';
+$labels['objectchangelog'] = 'Historie změn';
+$labels['objectdiff'] = 'Změny od $rev1 do $rev2';
+$labels['objectnotfound'] = 'Nepodařilo se nahrát data úkolu';
+$labels['objectchangelognotavailable'] = 'Historie změn není pro tento úkol dostupná';
+$labels['objectdiffnotavailable'] = 'Pro vybrané verze není žádné srovnání možné';
+$labels['revisionrestoreconfirm'] = 'Opravdu chcete obnovit změnu $rev tohoto úkolu? Tímto dojde k nahrazení nynějšího úkolu starou verzí.';
+$labels['objectrestoresuccess'] = 'Změna $rev úspěšně obnovena';
+$labels['objectrestoreerror'] = 'Nepodařilo se obnovit starou změnu';
 $labels['itipobjectnotfound'] = 'Úkol, na který tato zpráva odkazuje nebyl nalezen ve vašem seznamu úkolů.';
 $labels['itipmailbodyaccepted'] = "\$sender přijal přidělení úkolu:\n\n*\$title*\n\nTermín: \$date\n\nZadávající: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender předběžně přijal přidělení k následujícímu úkolu:\n\n*\$title*\n\nTermín: \$date\n\nPřiděleno: \$attendees";
@@ -153,13 +172,13 @@ $labels['errornotifying'] = 'Nepodařilo se poslat oznámení pověřeným osob
 $labels['removefromcalendar'] = 'Odstranit z mých úkolů';
 $labels['delegateinvitation'] = 'Delegovat přidělení';
 $labels['andnmore'] = 'dalších $nr...';
-$labels['delegatedto'] = 'Pověřený:';
-$labels['delegatedfrom'] = 'Pověřující:';
 $labels['savetotasklist'] = 'Uložit do úkolů';
 $labels['comment'] = 'Poznámka';
+$labels['rsvpcomment'] = 'Poznámka';
 $labels['errorimportingtask'] = 'Nepodařilo se zavést úkol(y)';
 $labels['importwarningexists'] = 'Kopie tohoto úkolu již je ve vašem seznamu úkolů.';
 $labels['importsuccess'] = 'Úspěšně zavedeno $nr úkolů';
+$labels['importerror'] = 'Při zavádění došlo k chybě';
 $labels['newerversionexists'] = 'Existuje již novější verze tohoto úkolu! Operace byla zrušena.';
 $labels['nowritetasklistfound'] = 'Nebyl nalezen žádný seznam úkolů, do kterého by šlo uložit tento úkol.';
 $labels['importedsuccessfully'] = 'Úkol byl úspěšně přidán do \'$list\'';
@@ -169,4 +188,4 @@ $labels['itipresponseerror'] = 'Nepodařilo se odeslat odpověď na toto přidě
 $labels['itipinvalidrequest'] = 'Tato pozvánka již není platná';
 $labels['sentresponseto'] = 'Odpověď na přidělení byla úspěšně odeslána na adresu $mailto';
 $labels['successremoval'] = 'Úkol byl úspěšně smazán.';
-$labels['arialabelsortmenu'] = 'Volby pro třídění úkolů';
+$labels['invalidlistproperties'] = 'Neplatné vlastnosti seznamu! Vložte, prosím, platný název.';
diff --git a/plugins/tasklist/localization/da_DK.inc b/plugins/tasklist/localization/da_DK.inc
index 9a452be1..b7c232b2 100644
--- a/plugins/tasklist/localization/da_DK.inc
+++ b/plugins/tasklist/localization/da_DK.inc
@@ -10,7 +10,21 @@ $labels['navtitle'] = 'Opgaver';
 $labels['lists'] = 'Opgavelister';
 $labels['list'] = 'Opgaveliste';
 $labels['tags'] = 'Mærker';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksportér til iCalendar';
+$labels['exportattachments'] = 'Med vedhæftninger';
+$labels['currentview'] = 'Aktuel visning';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['listsearchresults'] = 'Available Tasklists';
+$labels['findlists'] = 'Find tasklists...';
+$labels['searchterms'] = 'Search terms';
+$labels['notasklistsfound'] = 'No tasklists found';
+$labels['nrtasklistsfound'] = '$nr tasklists found';
+$labels['removelist'] = 'Remove from list';
+$labels['showcaldavurl'] = 'Vis CalDAV-URL';
+$labels['caldavurldescription'] = 'Kopiér denne adresse til et <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-klientprogram (eks. Evolution eller Mozilla Thunderbird) for at synkronisere denne specifikke opgaveliste med din computer eller mobilenhed.';
 $labels['newtask'] = 'Ny opgave';
+$labels['createtask'] = 'Create Task <Enter>';
 $labels['createnewtask'] = 'Opret ny opgave (eks. Lørdag, Slå græsplænen)';
 $labels['createfrommail'] = 'Gem som opgave';
 $labels['printtitle'] = 'Udskriv opgaver';
@@ -22,10 +36,21 @@ $labels['delete'] = 'Slet';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beskrivelse';
 $labels['datetime'] = 'Forfalder';
+$labels['duetime'] = 'Due time';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
 $labels['alarms'] = 'Påmindelse';
 $labels['repeat'] = 'Gentag';
+$labels['links'] = 'Reference';
+$labels['status'] = 'Status';
+$labels['status-needs-action'] = 'Needs action';
+$labels['status-in-process'] = 'In process';
 $labels['status-completed'] = 'Completed';
 $labels['status-cancelled'] = 'Annulleret';
+$labels['assignedto'] = 'Assigned to';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['taskoptions'] = 'Tilvalg';
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markeret';
 $labels['complete'] = 'Udført';
@@ -35,10 +60,14 @@ $labels['today'] = 'I dag';
 $labels['tomorrow'] = 'I morgen';
 $labels['next7days'] = 'Næste 7 dage';
 $labels['later'] = 'Senere';
+$labels['assigned'] = 'Assigned';
+$labels['assignedtitle'] = 'Tasks you assigned to others';
+$labels['mytasks'] = 'My tasks';
+$labels['mytaskstitle'] = 'Tasks assigned to you';
 $labels['nodate'] = 'ingen dato';
 $labels['removetag'] = 'Fjern';
+$labels['removelink'] = 'Remove email reference';
 $labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Detaljer';
 $labels['newtask'] = 'Ny opgave';
 $labels['edittask'] = 'Redigér opgave';
 $labels['save'] = 'Gem';
@@ -51,7 +80,7 @@ $labels['deletewithchilds'] = 'Slette inklusive alle delopgaver';
 $labels['taskactions'] = 'Task options...';
 $labels['tabsummary'] = 'Resumé';
 $labels['tabrecurrence'] = 'Gentagelse';
-$labels['tabassignments'] = 'Assignments';
+$labels['tabassignments'] = 'Opgaver';
 $labels['tabattachments'] = 'Vedhæftninger';
 $labels['tabsharing'] = 'Deling';
 $labels['editlist'] = 'Redigér liste';
@@ -66,6 +95,7 @@ $labels['on'] = 'til';
 $labels['at'] = 'ved';
 $labels['this'] = 'denne';
 $labels['next'] = 'næste';
+$labels['yes'] = 'ja';
 $labels['savingdata'] = 'Gemmer data...';
 $labels['errorsaving'] = 'Kunne ikke gemme data.';
 $labels['notasksfound'] = 'Fandt ingen opgaver ud fra angivne kriterie';
@@ -76,16 +106,86 @@ $labels['deletetasktconfirm'] = 'Vil du virkelig slette denne opgave?';
 $labels['deleteparenttasktconfirm'] = 'Vil du virkelig slette denne opgaver og alle dens delopgaver?';
 $labels['deletelistconfirm'] = 'Vil du virkelig slette denne liste og alle dens opgaver?';
 $labels['deletelistconfirmrecursive'] = 'Vil du virkelig slette denne liste og alle dens dellister og opgaver?';
+$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
+$labels['changetaskconfirm'] = 'Opdater opgave';
+$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
+$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
+$labels['quickaddinput'] = 'Dato og title for ny opgave';
+$labels['arialabelquickaddbox'] = 'Hurtig oprettelse af opgave';
+$labels['arialabelsearchform'] = 'Opgave søge formular';
+$labels['arialabelquicksearchbox'] = 'Opgave søge input';
+$labels['arialabellistsearchform'] = 'Opgaveliste søge formular';
+$labels['arialabeltaskselector'] = 'List mode';
+$labels['arialabeltasklisting'] = 'Opgave visning';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['attendee'] = 'Erhververen';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Tilg.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Tilføj erhververen';
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Påkrævet';
 $labels['roleoptional'] = 'Valgfri';
 $labels['rolechair'] = 'Formand';
+$labels['rolenonparticipant'] = 'Observer';
 $labels['sendinvitations'] = 'Send invitationer';
+$labels['sendnotifications'] = 'Informér erhververen om ændringer';
+$labels['sendcancellation'] = 'Informér erhververen om annullering af opgave';
+$labels['invitationsubject'] = 'Du er blevet tildet opgaven "$title"';
 $labels['itipupdatesubject'] = '"$title" er blevet opdateret';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
-$labels['itipcancelsubject'] = '"$title" er blevet aflyst';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
+$labels['itipcancelsubject'] = '"$title" er blevet annulleret';
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
+$labels['saveintasklist'] = 'Gem i';
+$labels['taskhistory'] = 'Historik';
+$labels['objectchangelog'] = 'Ændringshistorik';
+$labels['objectdiff'] = 'Ændringer fra $rev1 til $rev2';
+$labels['objectnotfound'] = 'Kunne ikke indlæse opgavedata';
+$labels['objectchangelognotavailable'] = 'Ændringshistorikken er ikke tilgængelig for denne opgave';
+$labels['objectdiffnotavailable'] = 'Det er ikke muligt at sammenligne de valgte revisioner';
+$labels['revisionrestoreconfirm'] = 'Sikker på at du vil genskabe revision $rev af denne opgave? Dette vil erstatte den nuværende opgave med den tidligere version.';
+$labels['objectrestoresuccess'] = 'Revision $rev blev genskabt';
+$labels['objectrestoreerror'] = 'Mislykkedes med at genskabe den gamle revision';
+$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
+$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegated'] = "\$sender has delegated the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender has delegated the following task to you:\n\n*\$title*\n\nDue: \$date";
+$labels['attendeeaccepted'] = 'Assignee has accepted';
+$labels['attendeetentative'] = 'Assignee has tentatively accepted';
+$labels['attendeedeclined'] = 'Assignee has declined';
+$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
+$labels['attendeein-process'] = 'Assignee is in-process';
+$labels['attendeecompleted'] = 'Assignee has completed';
+$labels['acceptinvitation'] = 'Do you accept this assignment?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Notification sent to assignees';
+$labels['errornotifying'] = 'Failed to send notifications to task assignees';
+$labels['removefromcalendar'] = 'Remove from my tasks';
+$labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr flere...';
+$labels['savetotasklist'] = 'Save to tasks';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Kommentar';
+$labels['errorimportingtask'] = 'Failed to import task(s)';
+$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
+$labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importerror'] = 'Der opstod en fejl under import';
+$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
+$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
+$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
+$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
 $labels['attendeupdateesuccess'] = 'Opdatering af deltagernes status blev gennemført';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
 $labels['itipinvalidrequest'] = 'Denne invitation er ikke længere gyldig';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'The task has been deleted successfully.';
+$labels['invalidlistproperties'] = 'Ugyldige liste parametre! Angiv et gyldigt navn.';
diff --git a/plugins/tasklist/localization/de_CH.inc b/plugins/tasklist/localization/de_CH.inc
index 5cd7da43..e80ffbdb 100644
--- a/plugins/tasklist/localization/de_CH.inc
+++ b/plugins/tasklist/localization/de_CH.inc
@@ -10,9 +10,24 @@ $labels['navtitle'] = 'Aufgaben';
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Liste';
 $labels['tags'] = 'Tags';
+$labels['export'] = 'Exportieren';
+$labels['exporttitle'] = 'Kalender als iCalendar exportieren';
+$labels['exportattachments'] = 'Mit Anhängen';
+$labels['currentview'] = 'Aktuelle Ansicht';
+$labels['tasklistsubscribe'] = 'Permanent anzeigen';
+$labels['listsearchresults'] = 'Verfügbare Aufgaben';
+$labels['findlists'] = 'Finde Aufgabenlisten,..';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['notasklistsfound'] = 'Keine Aufgabenlisten gefunden';
+$labels['nrtasklistsfound'] = '$nr Aufgabenlisten gefunden';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['showcaldavurl'] = 'CalDAV URL anzeigen';
+$labels['caldavurldescription'] = 'Kopieren dieser Adresse in eine <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</aClient-Anwendung (z.B. Evolution oder Mozilla Thunderbird), um diese spezifische Aufgabenliste mit Ihrem Computer oder Mobilgerät zu synchronisieren.';
 $labels['newtask'] = 'Neue Aufgabe';
+$labels['createtask'] = 'Aufgabe erstellen <Enter>';
 $labels['createnewtask'] = 'Neue Aufgabe eingeben (z.B. Samstag, Rasenmähen)';
 $labels['createfrommail'] = 'Als Aufgabe speichern';
+$labels['printtitle'] = 'Aufgaben drucken';
 $labels['printdescriptions'] = 'Beschrieb drucken';
 $labels['mark'] = 'Markieren';
 $labels['unmark'] = 'Markierung aufheben';
@@ -20,62 +35,158 @@ $labels['edit'] = 'Bearbeiten';
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
+$labels['datetime'] = 'Fällig';
+$labels['duetime'] = 'Frist';
 $labels['start'] = 'Beginn';
+$labels['starttime'] = 'Startzeit';
 $labels['alarms'] = 'Erinnerung';
 $labels['repeat'] = 'Wiederholung';
+$labels['links'] = 'Referenz';
 $labels['status'] = 'Status';
+$labels['status-needs-action'] = 'Braucht Aktion';
+$labels['status-in-process'] = 'In Bearbeitung';
+$labels['status-completed'] = 'Abgeschlossen';
 $labels['status-cancelled'] = 'Gekündigt';
+$labels['assignedto'] = 'Zugewiesen an';
+$labels['created'] = 'Erstellt';
+$labels['changed'] = 'Geändert';
+$labels['taskoptions'] = 'Optionen';
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markiert';
 $labels['complete'] = 'Erledigt';
+$labels['completeness'] = 'Fortschritt';
 $labels['overdue'] = 'Überfällig';
 $labels['today'] = 'Heute';
 $labels['tomorrow'] = 'Morgen';
 $labels['next7days'] = 'Nächste 7 Tage';
 $labels['later'] = 'Später';
+$labels['assigned'] = 'Zugewiesen';
+$labels['assignedtitle'] = 'Aufgaben, welche an andere vergeben wurden';
+$labels['mytasks'] = 'Meine Aufgaben';
+$labels['mytaskstitle'] = 'An mich übertragene Aufgaben';
 $labels['nodate'] = 'kein Datum';
 $labels['removetag'] = 'Löschen';
-$labels['taskdetails'] = 'Details';
+$labels['removelink'] = 'E-Mail-Referenz entfernen';
+$labels['auto'] = 'Automatisch';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['edittask'] = 'Aufgabe bearbeiten';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
+$labels['saveandnotify'] = 'Speichern und Benachrichtigen';
 $labels['addsubtask'] = 'Neue Teilaufgabe';
 $labels['deletetask'] = 'Aufgabe löschen';
 $labels['deletethisonly'] = 'Nur diese Aufgabe löschen';
 $labels['deletewithchilds'] = 'Mit allen Teilaufhaben löschen';
+$labels['taskactions'] = 'Aufgabeneinstellungen...';
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
+$labels['tabassignments'] = 'Zuweisungen';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
 $labels['editlist'] = 'Liste bearbeiten';
 $labels['createlist'] = 'Neue Liste';
 $labels['listactions'] = 'Listenoptionen...';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show reminders';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['import'] = 'Importieren';
+$labels['viewactions'] = 'Ansicht-Aktionen';
+$labels['focusview'] = 'Nur diese Liste anzeigen';
 $labels['on'] = 'am';
 $labels['at'] = 'um';
 $labels['this'] = 'diesen';
 $labels['next'] = 'nächsten';
+$labels['yes'] = 'Ja';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['notasksfound'] = 'Für die aktuellen Kriterien wurden keine Aufgaben gefunden.';
 $labels['invalidstartduedates'] = 'Beginn der Aufgabe darf nicht grösser als das Enddatum sein.';
+$labels['invalidstartduetimes'] = 'Start- und Enddatum müssen entweder beide oder keins eine Zeit enthalten.';
+$labels['recurrencerequiresdate'] = 'Wiederkehrende Aufgaben erfordern entweder ein Start- oder Enddatum.';
 $labels['deletetasktconfirm'] = 'Möchten Sie diese Aufgabe wirklich löschen?';
 $labels['deleteparenttasktconfirm'] = 'Möchten Sie diese Aufgabe inklusive aller Teilaufgaben wirklich löschen?';
 $labels['deletelistconfirm'] = 'Möchten Sie diese Liste mit allen Aufgaben wirklich löschen?';
+$labels['deletelistconfirmrecursive'] = 'Soll diese Liste wirklich mit allen Aufgaben und Unterlisten gelöscht werden?';
+$labels['aclnorights'] = 'Der Zugriff auf diese Aufgabenliste erfordert Administrator-Rechte.';
+$labels['changetaskconfirm'] = 'Aufgabe ändern';
+$labels['changeconfirmnotifications'] = 'Wollen Sie die beauftragten Teilnehmer über diese Änderung informieren?';
+$labels['partstatupdatenotification'] = 'Wollen Sie den Organisator über die Statusänderung benachrichtigen?';
+$labels['quickaddinput'] = 'Neue Aufgabe Datum und Titel';
+$labels['arialabelquickaddbox'] = 'Neue Aufgabe schnell hinzufügen';
+$labels['arialabelsearchform'] = 'Suchformular für Aufgaben';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe für Aufgaben';
+$labels['arialabellistsearchform'] = 'Sucheingabe für Aufgabenlisten';
+$labels['arialabeltaskselector'] = 'Listenmodus';
+$labels['arialabeltasklisting'] = 'Aufgabenauflistung';
+$labels['arialabelsortmenu'] = 'Aufgaben-Sortierungsoptionen';
+$labels['attendee'] = 'Beauftragter';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Verfüg.';
 $labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Beauftragten hinzufügen';
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Erforderlich';
 $labels['roleoptional'] = 'Optional';
 $labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Beobachter';
 $labels['sendinvitations'] = 'Einladungen versenden';
+$labels['sendnotifications'] = 'Beauftragte Teilnehmer über die Änderung informieren';
+$labels['sendcancellation'] = 'Beauftragte Teilnehmer über die Stornierung informieren';
+$labels['invitationsubject'] = 'Ihnen wurde "$title" zugewiesen';
+$labels['invitationmailbody'] = "*\$title*\n\nFällig: \$date\n\nBeauftragte: \$attendees\n\n\$description\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
+$labels['itipupdatesubjectempty'] = 'Eine ihrer Aufgabe wurde aktualisiert';
+$labels['itipupdatemailbody'] = "*\$title*\n\nFällig: \$date\n\nBeauftragte: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipcancelsubject'] = '"$title" wurde abgesagt';
+$labels['itipcancelmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
+$labels['saveintasklist'] = 'speichern in';
+$labels['taskhistory'] = 'Verlauf';
+$labels['objectchangelog'] = 'Änderungsverlauf';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['objectnotfound'] = 'Fehler beim Laden der Aufgabendaten';
+$labels['objectchangelognotavailable'] = 'Änderung der Historie ist nicht verfügbar für diese Aufgabe.';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['revisionrestoreconfirm'] = 'Möchten Sie wirklich die Version $rev dieser Aufgabe wiederherstellen? Dies wird die aktuelle Aufgabe mit der alten Version ersetzen.';
+$labels['objectrestoresuccess'] = 'Version $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
+$labels['itipobjectnotfound'] = 'Die Aufgabe, auf welche sich diese Nachricht bezieht, wurde nicht in Ihrer Aufgabenliste gefunden.';
+$labels['itipmailbodyaccepted'] = "\$sender hat die Zuweisung folgender Aufgabe akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender hat die Zuweisung folgender Aufgabe unter Vorbehalt akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender hat die Zuweisung folgender Aufgabe abgeleht:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender hat die Zuweisung folgender Aufgabe abgeleht:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodyin-process'] = "\$sender hat den Status folgender Aufgabe auf in-Bearbeitung gesetzt:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodycompleted'] = "\$sender hat folgende Aufgabe abgeschlossen:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodydelegated'] = "\$sender hat folgende Aufgabe delegiert:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat folgende Aufgabe an Sie delegiert:\n\n*\$title*\n\nFällig: \$date";
+$labels['attendeeaccepted'] = 'Delegierter hat akzeptiert';
+$labels['attendeetentative'] = 'Delegierter hat unter Vorbehalt akzeptiert';
+$labels['attendeedeclined'] = 'Delegierter hat abgelehnt';
+$labels['attendeedelegated'] = 'Zugewiesener hat zu $delegatedto delegiert';
+$labels['attendeein-process'] = 'Delegierter ist in Bearbeitung ';
+$labels['attendeecompleted'] = 'Delegierter hat abgeschlossen';
+$labels['acceptinvitation'] = 'Akzeptieren Sie die Zuweisung?';
+$labels['itipdeclinetask'] = 'Lehnen Sie to Zuweisung dieser Aufgabe ab';
+$labels['declinedeleteconfirm'] = 'Möchten Sie diese abgelehnete Aufgabe aus Ihrer Aufgabenliste löschen?';
+$labels['itipcomment'] = 'Kommentar zur Einladungs/Benachrichtigung';
+$labels['itipcommenttitle'] = 'Dieser Kommentar wird der Benachrichtigung an andere Delegierte hinzugefügt';
+$labels['itipsendsuccess'] = 'Benachrichtigung an Delegierte gesendet';
+$labels['errornotifying'] = 'Senden der Benachrichtigung an Delegierte fehlgeschlagen';
+$labels['removefromcalendar'] = 'Aus meinen Aufgaben entfernen';
+$labels['delegateinvitation'] = 'Zuweisung delegieren';
 $labels['andnmore'] = '$nr weitere...';
+$labels['savetotasklist'] = 'In den Aufgaben speichern';
 $labels['comment'] = 'Kommentar';
+$labels['rsvpcomment'] = 'Kommentar';
+$labels['errorimportingtask'] = 'Fehler beim Importieren der Aufgabe(n)';
+$labels['importwarningexists'] = 'Eine Kopie dieser Aufgabe exisistiert bereits in Ihrer Aufgabenliste';
+$labels['importsuccess'] = '$nr Aufgaben erfolgreich importiert';
+$labels['importerror'] = 'Fehler beim Importieren';
+$labels['newerversionexists'] = 'Eine neuere Version dieser Aufgabe existiert bereits! Abbruch.';
+$labels['nowritetasklistfound'] = 'Keine Aufgabenliste zum Speichern der Aufgabe gefunden';
+$labels['importedsuccessfully'] = 'Die Aufgabe wurde erfolgreich unter \'$list\' gespeichert';
+$labels['updatedsuccessfully'] = 'Die Aufgabe wurde erfolgreich in \'$list\' aktualisiert';
 $labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
+$labels['itipresponseerror'] = 'Senden der Antwort auf diese Aufgabenzuweisung fehlgeschlagen';
 $labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig';
+$labels['sentresponseto'] = 'Antwort auf Aufgabenzuweisung erfolgreich an $mailto versendet';
+$labels['successremoval'] = 'Diese Aufgabe wurde erfolgreich gelöscht.';
+$labels['invalidlistproperties'] = 'Ungültige Listeneigenschaften! Bitte einen gültigen Namen eingeben.';
diff --git a/plugins/tasklist/localization/de_DE.inc b/plugins/tasklist/localization/de_DE.inc
index 778a2473..9cbabad4 100644
--- a/plugins/tasklist/localization/de_DE.inc
+++ b/plugins/tasklist/localization/de_DE.inc
@@ -10,6 +10,10 @@ $labels['navtitle'] = 'Aufgaben';
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Aufgabenliste';
 $labels['tags'] = 'Schlagworte';
+$labels['export'] = 'Exportieren';
+$labels['exporttitle'] = 'Kalender als iCalendar exportieren';
+$labels['exportattachments'] = 'Mit Anhängen';
+$labels['currentview'] = 'Aktuelle Ansicht';
 $labels['tasklistsubscribe'] = 'Permanent anzeigen';
 $labels['listsearchresults'] = 'Verfügbare Aufgaben';
 $labels['findlists'] = 'Finde Aufgabenlisten,..';
@@ -17,12 +21,14 @@ $labels['searchterms'] = 'Suchbegriffe';
 $labels['notasklistsfound'] = 'Keine Aufgabenlisten gefunden';
 $labels['nrtasklistsfound'] = '$nr Aufgabenlisten gefunden';
 $labels['removelist'] = 'Von der Liste entfernen';
+$labels['showcaldavurl'] = 'CalDAV URL anzeigen';
+$labels['caldavurldescription'] = 'Kopieren dieser Adresse in eine <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> Client-Anwendung (z.B. Evolution oder Mozilla Thunderbird), um diese spezifische Aufgabenliste mit Ihrem Computer oder Mobilgerät zu synchronisieren.';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['createtask'] = 'Aufgabe erstellen <Enter>';
 $labels['createnewtask'] = 'Neue Aufgabe erstellen (z.B. Samstag, Rasen mähen)';
 $labels['createfrommail'] = 'Aufgabe speichern';
 $labels['printtitle'] = 'Aufgaben drucken';
-$labels['printdescriptions'] = 'Beschreibung drucken';
+$labels['printdescriptions'] = 'Beschreibungen drucken';
 $labels['mark'] = 'Markieren';
 $labels['unmark'] = 'Markierung entfernen';
 $labels['edit'] = 'Bearbeiten';
@@ -30,7 +36,7 @@ $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
 $labels['datetime'] = 'Fällig';
-$labels['duetime'] = 'Frist';
+$labels['duetime'] = 'Fällig';
 $labels['start'] = 'Beginn';
 $labels['starttime'] = 'Startzeit';
 $labels['alarms'] = 'Erinnerung';
@@ -40,10 +46,11 @@ $labels['status'] = 'Status';
 $labels['status-needs-action'] = 'Braucht Aktion';
 $labels['status-in-process'] = 'In Bearbeitung';
 $labels['status-completed'] = 'Abgeschlossen';
-$labels['status-cancelled'] = 'Hinfällig';
+$labels['status-cancelled'] = 'Abgesagt';
 $labels['assignedto'] = 'Zugewiesen an';
 $labels['created'] = 'Erstellt';
-$labels['changed'] = 'Geändert';
+$labels['changed'] = 'Zuletzt geändert';
+$labels['taskoptions'] = 'Optionen';
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markiert';
 $labels['complete'] = 'Abgeschlossen';
@@ -61,7 +68,6 @@ $labels['nodate'] = 'Ohne Datum';
 $labels['removetag'] = 'Entfernen';
 $labels['removelink'] = 'E-Mail-Referenz entfernen';
 $labels['auto'] = 'Automatisch';
-$labels['taskdetails'] = 'Details';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['edittask'] = 'Aufgabe ändern';
 $labels['save'] = 'Speichern';
@@ -81,6 +87,7 @@ $labels['editlist'] = 'Liste bearbeiten';
 $labels['createlist'] = 'Liste hinzufügen';
 $labels['listactions'] = 'Listeneinstellungen…';
 $labels['listname'] = 'Name';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['import'] = 'Importieren';
 $labels['viewactions'] = 'Ansicht-Aktionen';
 $labels['focusview'] = 'Nur diese Liste anzeigen';
@@ -88,10 +95,13 @@ $labels['on'] = 'am';
 $labels['at'] = 'um';
 $labels['this'] = 'dies';
 $labels['next'] = 'weiter';
+$labels['yes'] = 'Ja';
 $labels['savingdata'] = 'Daten werden gespeichert…';
 $labels['errorsaving'] = 'Daten konnten nicht gespeichert werden.';
 $labels['notasksfound'] = 'Keine Aufgabe erfüllt die angelegten Kriterien';
 $labels['invalidstartduedates'] = 'Das Anfangsdatum muss vor dem Fälligkeitsdatum liegen.';
+$labels['invalidstartduetimes'] = 'Start- und Enddatum müssen entweder beide oder keins eine Zeit enthalten.';
+$labels['recurrencerequiresdate'] = 'Wiederkehrende Aufgaben erfordern entweder ein Start- oder Enddatum.';
 $labels['deletetasktconfirm'] = 'Diese Aufgabe wirklich löschen?';
 $labels['deleteparenttasktconfirm'] = 'Diese Aufgabe wirklich mit allen Teilaufgaben löschen?';
 $labels['deletelistconfirm'] = 'Diese Aufgabenliste wirklich mit allen Aufgaben löschen?';
@@ -107,6 +117,7 @@ $labels['arialabelquicksearchbox'] = 'Sucheingabe für Aufgaben';
 $labels['arialabellistsearchform'] = 'Sucheingabe für Aufgabenlisten';
 $labels['arialabeltaskselector'] = 'Listenmodus';
 $labels['arialabeltasklisting'] = 'Aufgabenauflistung';
+$labels['arialabelsortmenu'] = 'Aufgaben-Sortierungsoptionen';
 $labels['attendee'] = 'Beauftragter';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Verfüg.';
@@ -121,13 +132,22 @@ $labels['sendinvitations'] = 'Einladungen versenden';
 $labels['sendnotifications'] = 'Beauftragte Teilnehmer über die Änderung informieren';
 $labels['sendcancellation'] = 'Beauftragte Teilnehmer über die Stornierung informieren';
 $labels['invitationsubject'] = 'Ihnen wurde "$title" zugewiesen';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['invitationmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\n\$description\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
 $labels['itipupdatesubjectempty'] = 'Eine ihrer Aufgabe wurde aktualisiert';
-$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['itipupdatemailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipcancelsubject'] = '"$title" wurde abgesagt';
-$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
+$labels['itipcancelmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
 $labels['saveintasklist'] = 'speichern in';
+$labels['taskhistory'] = 'Historie';
+$labels['objectchangelog'] = 'Änderungshistorie';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['objectnotfound'] = 'Fehler beim Laden der Aufgabendaten';
+$labels['objectchangelognotavailable'] = 'Änderung der Historie ist nicht verfügbar für diese Aufgabe.';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['revisionrestoreconfirm'] = 'Möchten Sie wirklich die Version $rev dieser Aufgabe wiederherstellen? Dies wird die aktuelle Aufgabe mit der alten Version ersetzen.';
+$labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
 $labels['itipobjectnotfound'] = 'Die Aufgabe, auf welche sich diese Nachricht bezieht, wurde nicht in Ihrer Aufgabenliste gefunden.';
 $labels['itipmailbodyaccepted'] = "\$sender hat die Zuweisung folgender Aufgabe akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender hat die Zuweisung folgender Aufgabe unter Vorbehalt akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
@@ -153,13 +173,13 @@ $labels['errornotifying'] = 'Senden der Benachrichtigung an Delegierte fehlgesch
 $labels['removefromcalendar'] = 'Aus meinen Aufgaben entfernen';
 $labels['delegateinvitation'] = 'Zuweisung delegieren';
 $labels['andnmore'] = '$nr weitere...';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
 $labels['savetotasklist'] = 'In den Aufgaben speichern';
 $labels['comment'] = 'Kommentar';
+$labels['rsvpcomment'] = 'Kommentar';
 $labels['errorimportingtask'] = 'Fehler beim Importieren der Aufgabe(n)';
 $labels['importwarningexists'] = 'Eine Kopie dieser Aufgabe exisistiert bereits in Ihrer Aufgabenliste';
 $labels['importsuccess'] = '$nr Aufgaben erfolgreich importiert';
+$labels['importerror'] = 'Fehler beim Importieren';
 $labels['newerversionexists'] = 'Eine neuere Version dieser Aufgabe existiert bereits! Abbruch.';
 $labels['nowritetasklistfound'] = 'Keine Aufgabenliste zum Speichern der Aufgabe gefunden';
 $labels['importedsuccessfully'] = 'Die Aufgabe wurde erfolgreich unter \'$list\' gespeichert';
@@ -169,4 +189,4 @@ $labels['itipresponseerror'] = 'Senden der Antwort auf diese Aufgabenzuweisung f
 $labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig.';
 $labels['sentresponseto'] = 'Antwort auf Aufgabenzuweisung erfolgreich an $mailto versendet';
 $labels['successremoval'] = 'Diese Aufgabe wurde erfolgreich gelöscht.';
-$labels['arialabelsortmenu'] = 'Aufgaben-Sortierungsoptionen';
+$labels['invalidlistproperties'] = 'Ungültige Listeneigenschaften! Bitte einen gültigen Namen eingeben.';
diff --git a/plugins/tasklist/localization/el.inc b/plugins/tasklist/localization/el.inc
new file mode 100644
index 00000000..f199e1c0
--- /dev/null
+++ b/plugins/tasklist/localization/el.inc
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['navtitle'] = 'Εργασίες';
+$labels['list'] = 'Λίστα εργασιών';
+$labels['tags'] = 'Ετικέτες';
+$labels['export'] = 'Εξαγωγή';
+$labels['exporttitle'] = 'Εξαγωγή σε iCalendar';
+$labels['currentview'] = 'τρέχουσα προβολή';
+$labels['searchterms'] = 'Όροι αναζήτησης';
+$labels['removelist'] = 'Αφαίρεση από την λίστα';
+$labels['newtask'] = 'Νέα εργασία';
+$labels['createfrommail'] = 'Αποθήκευση ως εργασία';
+$labels['printtitle'] = 'Εκτύπωση εργασιών';
+$labels['edit'] = 'Επεξεργασία';
+$labels['delete'] = 'Διαγραφή';
+$labels['title'] = 'Τίτλος';
+$labels['description'] = 'Περιγραφή';
+$labels['start'] = 'Έναρξη';
+$labels['starttime'] = 'Ώρα έναρξης';
+$labels['repeat'] = 'Επανάληψη';
+$labels['status'] = 'Κατάσταση';
+$labels['status-completed'] = 'Ολοκληρώθηκε';
+$labels['created'] = 'Δημιουργήθηκε';
+$labels['changed'] = 'Τελευταία τροποποίηση';
+$labels['today'] = 'Σήμερα';
+$labels['tomorrow'] = 'Αύριο';
+$labels['removetag'] = 'Αφαίρεση';
+$labels['newtask'] = 'Νέα εργασία';
+$labels['save'] = 'Αποθήκευση';
+$labels['cancel'] = 'Άκυρο';
+$labels['tabsummary'] = 'Περίληψη';
+$labels['listname'] = 'Όνομα';
+$labels['yes'] = 'ναι';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+$labels['role'] = 'Ρόλος';
+$labels['availability'] = 'Διαθ.';
+$labels['confirmstate'] = 'Κατάσταση';
+$labels['roleorganizer'] = 'Οργανωτής';
+$labels['taskhistory'] = 'Ιστορικό';
+$labels['objectchangelog'] = 'Αλλαγή ιστορικού';
+$labels['comment'] = 'Σχόλιο';
+$labels['rsvpcomment'] = 'Σχόλιο';
diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index 2b2db862..5223f377 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -13,9 +13,14 @@ $labels['navtitle'] = 'Tasks';
 $labels['lists'] = 'Tasklists';
 $labels['list'] = 'Tasklist';
 $labels['tags'] = 'Tags';
+$labels['export'] = 'Export';
+$labels['exporttitle'] = 'Export to iCalendar';
+$labels['exportattachments'] = 'With attachments';
+$labels['currentview'] = 'current view';
 $labels['tasklistsubscribe'] = 'List permanently';
 $labels['listsearchresults'] = 'Available Tasklists';
 $labels['findlists'] = 'Find tasklists...';
+$labels['findtasks'] = 'Find tasks...';
 $labels['searchterms'] = 'Search terms';
 $labels['notasklistsfound'] = 'No tasklists found';
 $labels['nrtasklistsfound'] = '$nr tasklists found';
@@ -70,7 +75,7 @@ $labels['removetag'] = 'Remove';
 $labels['removelink'] = 'Remove email reference';
 $labels['auto'] = 'Auto';
 
-$labels['taskdetails'] = 'Details';
+$labels['taskdetails'] = 'Task details';
 $labels['newtask'] = 'New Task';
 $labels['edittask'] = 'Edit Task';
 $labels['save'] = 'Save';
@@ -94,8 +99,10 @@ $labels['listactions'] = 'List options...';
 $labels['listname'] = 'Name';
 $labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Import';
+$labels['importtasks'] = 'Import Tasks';
 $labels['viewactions'] = 'View actions';
 $labels['focusview'] = 'View only this list';
+$labels['activate'] = 'Activate';
 
 // date words
 $labels['on'] = 'on';
@@ -128,6 +135,9 @@ $labels['arialabelquicksearchbox'] = 'Task search input';
 $labels['arialabellistsearchform'] = 'Tasklists search form';
 $labels['arialabeltaskselector'] = 'List mode';
 $labels['arialabeltasklisting'] = 'Tasks listing';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['arialabeltasklistform'] = 'Tasks list properties';
+$labels['arialabeltaskform'] = 'Task editing form';
 
 // attendees
 $labels['attendee'] = 'Assignee';
@@ -144,11 +154,11 @@ $labels['sendinvitations'] = 'Send invitations';
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
+$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\n\$description\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '"$title" has been updated';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
-$labels['itipcancelsubject'] = '"$title" has been canceled';
+$labels['itipcancelsubject'] = '"$title" has been cancelled';
 $labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
 $labels['saveintasklist'] = 'save in ';
 
@@ -192,14 +202,16 @@ $labels['errornotifying'] = 'Failed to send notifications to task assignees';
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 
+$labels['importtext'] = 'You can upload tasks in <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> format (.ics).';
 $labels['andnmore'] = '$nr more...';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
 $labels['errorimportingtask'] = 'Failed to import task(s)';
 $labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
 $labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importnone'] = 'No tasks found to be imported';
+$labels['importerror'] = 'An error occured while importing';
 $labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
 $labels['nowritetasklistfound'] = 'No tasklist found to save the task';
 $labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
@@ -210,4 +222,3 @@ $labels['itipinvalidrequest'] = 'This invitation is no longer valid';
 $labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
 $labels['successremoval'] = 'The task has been deleted successfully.';
 $labels['invalidlistproperties'] = 'Invalid list properties! Please set a valid name.';
-$labels['arialabelsortmenu'] = 'Tasks sorting options';
diff --git a/plugins/tasklist/localization/es_AR.inc b/plugins/tasklist/localization/es_AR.inc
index 68d4fb17..a64fb322 100644
--- a/plugins/tasklist/localization/es_AR.inc
+++ b/plugins/tasklist/localization/es_AR.inc
@@ -10,17 +10,25 @@ $labels['navtitle'] = 'Tareas';
 $labels['lists'] = 'Listas de tareas';
 $labels['list'] = 'Lista de tareas';
 $labels['tags'] = 'Etiquetas';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar a iCalendar';
+$labels['exportattachments'] = 'Con adjunto';
+$labels['currentview'] = 'vista actual';
 $labels['tasklistsubscribe'] = 'Listar permanentemente';
 $labels['listsearchresults'] = 'Listas de tareas disponibles';
 $labels['findlists'] = 'Encontrar listas de tareas...';
+$labels['findtasks'] = 'Encontrar tareas...';
 $labels['searchterms'] = 'Buscar términos';
 $labels['notasklistsfound'] = 'No se encontraron listas de tareas';
 $labels['nrtasklistsfound'] = '$nr listas de tareas encontradas';
 $labels['removelist'] = 'Eliminar de la lista';
+$labels['showcaldavurl'] = 'Mostrar URL CalDAV';
+$labels['caldavurldescription'] = 'Copie esta direccion a su aplicación cliente <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (por ejemplo, Evolution o Mozilla Thunderbird) para sincronizar esta lista de tareas específica con su ordenador o dispositivo móvil.';
 $labels['newtask'] = 'Nueva Tarea';
 $labels['createtask'] = 'Crear Tarea <Enter>';
 $labels['createnewtask'] = 'Crear nueva Tarea (ej. Sábado, Cortar el césped)';
 $labels['createfrommail'] = 'Guardar como tarea';
+$labels['printtitle'] = 'Imprimir tareas';
 $labels['printdescriptions'] = 'Imprimir descripciones';
 $labels['mark'] = 'Marcar';
 $labels['unmark'] = 'Desmarcar';
@@ -34,6 +42,7 @@ $labels['start'] = 'Inicio';
 $labels['starttime'] = 'Hora de inicio';
 $labels['alarms'] = 'Recordatorio';
 $labels['repeat'] = 'Repetir';
+$labels['links'] = 'Referencia';
 $labels['status'] = 'Estado';
 $labels['status-needs-action'] = 'Necesita acción';
 $labels['status-in-process'] = 'En proceso';
@@ -42,6 +51,7 @@ $labels['status-cancelled'] = 'Cancelado';
 $labels['assignedto'] = 'Asignado a';
 $labels['created'] = 'Creado';
 $labels['changed'] = 'Última modificación';
+$labels['taskoptions'] = 'Opciones';
 $labels['all'] = 'Todos';
 $labels['flagged'] = 'Marcado';
 $labels['complete'] = 'Completar';
@@ -57,8 +67,9 @@ $labels['mytasks'] = 'Mis tareas';
 $labels['mytaskstitle'] = 'Tareas asignadas a usted';
 $labels['nodate'] = 'sin fecha';
 $labels['removetag'] = 'Elminiar';
+$labels['removelink'] = 'Eliminar referencia de correo';
 $labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Detalles';
+$labels['taskdetails'] = 'Detalles de la tarea';
 $labels['newtask'] = 'Nueva Tarea';
 $labels['edittask'] = 'Editar Tarea';
 $labels['save'] = 'Guardar';
@@ -80,16 +91,21 @@ $labels['listactions'] = 'Opciones de la lista...';
 $labels['listname'] = 'Nombre';
 $labels['showalarms'] = 'Mostrar alarmas';
 $labels['import'] = 'Importar';
+$labels['importtasks'] = 'Importar Tareas';
 $labels['viewactions'] = 'Ver acciones';
 $labels['focusview'] = 'Ver sólo esta lista';
+$labels['activate'] = 'Activar';
 $labels['on'] = 'sobre';
 $labels['at'] = 'en';
 $labels['this'] = 'este';
 $labels['next'] = 'siguiente';
+$labels['yes'] = 'si';
 $labels['savingdata'] = 'Guardando...';
 $labels['errorsaving'] = 'Fallo al guardar datos.';
 $labels['notasksfound'] = 'No se encontraron tareas para la búsqueda seleccionada';
 $labels['invalidstartduedates'] = 'La fecha de inicio no debe ser superior a la fecha de vencimiento';
+$labels['invalidstartduetimes'] = 'Las fechas de inicio o límite deben especificar un valor ambos o ninguno';
+$labels['recurrencerequiresdate'] = 'Las tareas recurrentes requieren una fecha de inicio o una fecha límite';
 $labels['deletetasktconfirm'] = 'Confirme que desea eliminar esta tarea';
 $labels['deleteparenttasktconfirm'] = 'Confirme que desea eliminar esta tarea junto con todas sus subtareas';
 $labels['deletelistconfirm'] = 'Confirme que desea eliminar esta lista con todas sus tareas';
@@ -105,6 +121,9 @@ $labels['arialabelquicksearchbox'] = 'Entrada de búsqueda de tarea';
 $labels['arialabellistsearchform'] = 'Formulario de búsquedas de listas de tareas';
 $labels['arialabeltaskselector'] = 'Modo de lista';
 $labels['arialabeltasklisting'] = 'Listado de tareas';
+$labels['arialabelsortmenu'] = 'Opciones de orden de tareas';
+$labels['arialabeltasklistform'] = 'Lista de propiedades de tareas';
+$labels['arialabeltaskform'] = 'Formulario de edición de tarea';
 $labels['attendee'] = 'Asignado';
 $labels['role'] = 'Rol';
 $labels['availability'] = 'Disp.';
@@ -119,13 +138,22 @@ $labels['sendinvitations'] = 'Enviar invitaciones';
 $labels['sendnotifications'] = 'Notificar a los asignados sobre las modificaciones';
 $labels['sendcancellation'] = 'Notificar a los asignados sobre la cancelación de la tarea';
 $labels['invitationsubject'] = 'Ha sido asignado a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\nEncontrará adjunto un archivo iCalendar con todos los detalles de la tarea, el cual puede importar a su aplicación de tareas.";
+$labels['invitationmailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\n$descripcion\n\nEncontrará adjunto un archivo iCalendar con todos los detalles de la tarea, el cual puede importar a su aplicación de tareas.";
 $labels['itipupdatesubject'] = '"$title" ha sido actualizado';
 $labels['itipupdatesubjectempty'] = 'Una tarea que le interesa ha sido actualizada';
 $labels['itipupdatemailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\Encontrará adjunto un archivo iCalendar con todos los detalles de la tarea, el cual puede importar a su aplicación de tareas.";
-$labels['itipcancelsubject'] = '"$title" has been canceled';
+$labels['itipcancelsubject'] = '"$title" ha sido cancelado';
 $labels['itipcancelmailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\La tarea ha sido cancelada por \$organizer.\n\nEncontrará adjunto un archivo iCalendar con todos los detalles actualizados de la tarea.";
 $labels['saveintasklist'] = 'guardar en';
+$labels['taskhistory'] = 'Historial';
+$labels['objectchangelog'] = 'Cambiar Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
+$labels['objectnotfound'] = 'Fallo al cargar datos de la tarea';
+$labels['objectchangelognotavailable'] = 'Cambiar historial no está disponible para esta tarea';
+$labels['objectdiffnotavailable'] = 'No es posible comparar las revisiones seleccionadas';
+$labels['revisionrestoreconfirm'] = 'Confirme que quiere recuperar la revisión $rev de esta tarea. Esta acción reemplazará la tarea actual con la versión anterior.';
+$labels['objectrestoresuccess'] = 'Revisión $rev recuperada exitosamente';
+$labels['objectrestoreerror'] = 'Fallo al restaurar el evento anterior';
 $labels['itipobjectnotfound'] = 'La tarea referida por este mensaje no fue encontrada en su lista de tareas.';
 $labels['itipmailbodyaccepted'] = "\$sender ha aceptado la asignación a la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender ha tentativamente aceptado la asignación a la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees";
@@ -133,6 +161,8 @@ $labels['itipmailbodydeclined'] = "\$sender ha rechazado la asignación a la sig
 $labels['itipmailbodycancel'] = "\$sender ha rechazado tu asignación a la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date";
 $labels['itipmailbodyin-process'] = "\$sender ha cambiado el estado de la siguiente tarea a en proceso:\n\n*\$title*\n\nVencimiento: \$date";
 $labels['itipmailbodycompleted'] = "\$sender ha completado la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date";
+$labels['itipmailbodydelegated'] = "\$sender ha delegado la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ha delegado la siguiente tarea a usted:\n\n*\$title*\n\nVencimiento: \$date";
 $labels['attendeeaccepted'] = 'La persona asignada ha aceptado';
 $labels['attendeetentative'] = 'La persona asignada ha aceptado tentativamente';
 $labels['attendeedeclined'] = 'La persona asignada ha rechazado';
@@ -144,16 +174,20 @@ $labels['itipdeclinetask'] = 'Rechace su asignación a esta tarea al organizador
 $labels['declinedeleteconfirm'] = '¿Quiere también eliminar esta tarea rechazado de su lista de tareas?';
 $labels['itipcomment'] = 'Comentario de la invitación/notificación';
 $labels['itipcommenttitle'] = 'Este comentario será adjuntado al mensaje de invitación/notificación enviado a las personas asignadas';
+$labels['itipsendsuccess'] = 'Notificación enviada a las personas asignadas';
 $labels['errornotifying'] = 'Fallo al enviar las notificaciones de la tarea a las personas asignadas';
 $labels['removefromcalendar'] = 'Eliminar de mis tareas';
+$labels['delegateinvitation'] = 'Delegar asignación';
+$labels['importtext'] = 'Puede subir tareas en formato <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> (.ics)';
 $labels['andnmore'] = '$nr más...';
-$labels['delegatedto'] = 'Delegado a:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['savetotasklist'] = 'Guardar como tareas';
 $labels['comment'] = 'Comentario';
+$labels['rsvpcomment'] = 'Comentario';
 $labels['errorimportingtask'] = 'Fallo al importar tarea(s)';
 $labels['importwarningexists'] = 'Una copia de esta tarea ya existe en su lista de tareas.';
 $labels['importsuccess'] = 'Importadas $nr tareas exitosamente';
+$labels['importnone'] = 'No se importaron tareas';
+$labels['importerror'] = 'Fallo al importar';
 $labels['newerversionexists'] = 'Ya existe una versión actualizada de esta tarea. Cancelado.';
 $labels['nowritetasklistfound'] = 'No hay lista de tareas para guardar esta tarea';
 $labels['importedsuccessfully'] = 'La tarea fue guardada en \'$list\' exitosamente';
@@ -163,4 +197,4 @@ $labels['itipresponseerror'] = 'Fallo enviando la respuesta a la asignación de
 $labels['itipinvalidrequest'] = 'Esta invitación no es válida';
 $labels['sentresponseto'] = 'Se envió la respuesta a la asignación a $mailto exitosamente';
 $labels['successremoval'] = 'La tarea ha sido eliminada exitosamente.';
-$labels['arialabelsortmenu'] = 'Opciones de orden de tareas';
+$labels['invalidlistproperties'] = 'Propiedades de la lista erroneas. Por favor ingrese un nombre válido.';
diff --git a/plugins/tasklist/localization/es_ES.inc b/plugins/tasklist/localization/es_ES.inc
index 2f255993..9bfe181e 100644
--- a/plugins/tasklist/localization/es_ES.inc
+++ b/plugins/tasklist/localization/es_ES.inc
@@ -7,16 +7,185 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 $labels['navtitle'] = 'Tareas';
+$labels['lists'] = 'Listas de tareas';
+$labels['list'] = 'Lista de tarea';
+$labels['tags'] = 'Tags';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar a iCalendar';
+$labels['exportattachments'] = 'con los adjuntos';
+$labels['currentview'] = 'Vista actual';
+$labels['tasklistsubscribe'] = 'Lista Permanente';
+$labels['listsearchresults'] = 'Lista de tareas disponibles';
+$labels['findlists'] = 'Buscar lista de tareas';
+$labels['searchterms'] = 'Buscar término';
+$labels['notasklistsfound'] = 'No se econtró ninguna lista de tarea';
+$labels['nrtasklistsfound'] = '$nr Lista de tareas encontradas';
+$labels['removelist'] = 'Borrar de la lista';
+$labels['showcaldavurl'] = 'Mostrar URL de CalDAV';
+$labels['caldavurldescription'] = 'Copie esta dirección en un <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> cliente (Evolution o Mozilla Thunderbidr) para sincronizar esta tarea con su ordenador o celular.';
+$labels['newtask'] = 'Nueva tarea';
+$labels['createtask'] = 'Crear tarea <Enter>';
+$labels['createnewtask'] = 'Crear nueva tarea (ejemplo. Sábado, Cortar el césped)';
+$labels['createfrommail'] = 'Salvar tarea';
+$labels['printtitle'] = 'Imprimir tarea';
+$labels['printdescriptions'] = 'Imprimir descripción ';
+$labels['mark'] = 'Marcar';
+$labels['unmark'] = 'Desmarcar';
 $labels['edit'] = 'Editar';
 $labels['delete'] = 'Borrar';
 $labels['title'] = 'Título';
 $labels['description'] = 'Descripción';
-$labels['taskdetails'] = 'Detalles';
+$labels['datetime'] = 'Esperado';
+$labels['duetime'] = 'Plazo estipulado';
+$labels['start'] = 'Inicio';
+$labels['starttime'] = 'Tiempo de inicio';
+$labels['alarms'] = 'Recordatorio';
+$labels['repeat'] = 'Repetir';
+$labels['links'] = 'Referencia';
+$labels['status'] = 'Estado';
+$labels['status-needs-action'] = 'Necesita acción';
+$labels['status-in-process'] = 'En proceso';
+$labels['status-completed'] = 'Realizado';
+$labels['status-cancelled'] = 'Cancelado';
+$labels['assignedto'] = 'Asignado a';
+$labels['created'] = 'Creado';
+$labels['changed'] = 'Última modificación';
+$labels['taskoptions'] = 'Opciones';
+$labels['all'] = 'Todo';
+$labels['flagged'] = 'Marcado';
+$labels['complete'] = 'Completar';
+$labels['completeness'] = 'Progreso';
+$labels['overdue'] = 'Atrasado';
+$labels['today'] = 'Hoy';
+$labels['tomorrow'] = 'Mañana';
+$labels['next7days'] = 'Próximos 7 días';
+$labels['later'] = 'Luego';
+$labels['assigned'] = 'Asignado';
+$labels['assignedtitle'] = 'Tareas que asigna a otros';
+$labels['mytasks'] = 'Mis tareas';
+$labels['mytaskstitle'] = 'Tareas asignadas a ti';
+$labels['nodate'] = 'Sin fecha';
+$labels['removetag'] = 'Eliminar';
+$labels['removelink'] = 'Eliminar la referencia de correo electrónico';
+$labels['auto'] = 'Auto';
+$labels['newtask'] = 'Nueva tarea';
+$labels['edittask'] = 'Editar tarea';
 $labels['save'] = 'Guardar';
 $labels['cancel'] = 'Cancelar';
+$labels['saveandnotify'] = 'Salvar y notificar';
+$labels['addsubtask'] = 'Añadir subtarea';
+$labels['deletetask'] = 'Borrar tarea';
+$labels['deletethisonly'] = 'Borrar solo esta tarea';
+$labels['deletewithchilds'] = 'Borrar con todas las subtareas';
+$labels['taskactions'] = 'Opciones de tareas...';
+$labels['tabsummary'] = 'Sumario';
+$labels['tabrecurrence'] = 'Se repite';
+$labels['tabassignments'] = 'Asignaciones';
+$labels['tabattachments'] = 'Adjuntos';
+$labels['tabsharing'] = 'Compartir';
+$labels['editlist'] = 'Editar lista';
+$labels['createlist'] = 'Añadir lista';
+$labels['listactions'] = 'Opciones de lista...';
 $labels['listname'] = 'Nombre';
+$labels['showalarms'] = 'Mostrar recordatorios';
+$labels['import'] = 'Importar';
+$labels['viewactions'] = 'Ver acciones';
+$labels['focusview'] = 'Sólo ver esta lista';
+$labels['on'] = 'en';
+$labels['at'] = 'a';
+$labels['this'] = 'esta';
+$labels['next'] = 'próximo';
+$labels['yes'] = 'sí';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['errorsaving'] = 'Error al guardar los datos.';
+$labels['notasksfound'] = 'No se encontraron tareas que coincidan con el criterio dado';
+$labels['invalidstartduedates'] = 'La fecha de inicio no debe ser mayor que la fecha de vencimiento.';
+$labels['invalidstartduetimes'] = 'Las fechas de inicio y vencimiento deben ser dispuestas en ambos casos o en ninguno.';
+$labels['recurrencerequiresdate'] = 'Las tareas recurrentes requieren una fecha de inicio o vencimiento.';
+$labels['deletetasktconfirm'] = '¿De verdad quiere eliminar esta tarea?';
+$labels['deleteparenttasktconfirm'] = '¿De verdad quiere eliminar esta tarea y todas sus subtareas?';
+$labels['deletelistconfirm'] = '¿De verdad quiere eliminar esta lista con todas sus tareas?';
+$labels['deletelistconfirmrecursive'] = '¿Realmente desea borrar esta lista con todos sus sub-listas y tareas?';
+$labels['aclnorights'] = 'Usted no tiene derechos de administrador en esta lista de tareas.';
+$labels['changetaskconfirm'] = 'Actualizar tarea';
+$labels['changeconfirmnotifications'] = '¿Quieres notificar a los asistentes acerca de la modificación?';
+$labels['partstatupdatenotification'] = '¿Quieres notificar al organizador sobre el cambio de estado?';
+$labels['quickaddinput'] = 'Nueva fecha de la tarea y el título';
+$labels['arialabelquickaddbox'] = 'Añadir nueva tarea rápida';
+$labels['arialabelsearchform'] = 'Búsqueda de tareas';
+$labels['arialabelquicksearchbox'] = 'Búsqueda de tareas';
+$labels['arialabellistsearchform'] = 'Búsqueda de listas de tareas ';
+$labels['arialabeltaskselector'] = 'Modo de lista';
+$labels['arialabeltasklisting'] = 'Listado de tareas';
+$labels['arialabelsortmenu'] = 'Opciones de clasificación de tareas';
+$labels['attendee'] = 'Participantes';
 $labels['role'] = 'Rol';
+$labels['availability'] = 'Disponible';
+$labels['confirmstate'] = 'Estado';
+$labels['addattendee'] = 'Añadir participante';
+$labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Requerido';
 $labels['roleoptional'] = 'Opcional';
+$labels['rolechair'] = 'Silla';
+$labels['rolenonparticipant'] = 'Observador';
+$labels['sendinvitations'] = 'Enviar invitaciones';
+$labels['sendnotifications'] = 'Notificar a los asignados sobre modificaciones';
+$labels['sendcancellation'] = 'Notificar a los asignados sobre la cancelación de tareas';
+$labels['invitationsubject'] = 'Usted ha sido asignado a "$title"';
+$labels['itipupdatesubject'] = '"$title" ha sido actualizada';
+$labels['itipupdatesubjectempty'] = 'Una tarea que le concierne ha sido actualizada';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nSe adjunta un archivo iCalendar con los detalles de la tarea actualizada, el mismo se puede importar a la aplicación de tareas.";
+$labels['itipcancelsubject'] = 'Se ha cancelado "$título"';
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nLa tarea ha sido cancelado por \$organizer.\n\nSe adjunta un archivo iCalendar con los detalles de la tarea actualizada.";
+$labels['saveintasklist'] = 'salvar en';
+$labels['taskhistory'] = 'Historial';
+$labels['objectchangelog'] = 'Cambiar historial';
+$labels['objectdiff'] = 'Cambiar de $rev1 a $rev2';
+$labels['objectnotfound'] = 'No se pudo cargar los datos de la tarea';
+$labels['objectchangelognotavailable'] = 'Historial de cambios no está disponible para esta tarea';
+$labels['objectdiffnotavailable'] = 'No hay comparación posible que las revisiones seleccionadas';
+$labels['revisionrestoreconfirm'] = '¿Realmente desea restaurar la edición $rev de esta tarea? Esto reemplazará la tarea actual con la antigua versión.';
+$labels['objectrestoresuccess'] = 'Revisión $rev restaurado correctamente';
+$labels['objectrestoreerror'] = 'No se pudo restaurar la revisión antigua';
+$labels['itipobjectnotfound'] = 'La tarea referida por este mensaje no se encontró en su lista de tareas.';
+$labels['itipmailbodyaccepted'] = "\$sender ha aceptado la asignación a la siguiente tarea:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender ha aceptado provisionalmente la asignación a la siguiente tarea:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender ha declinado la asignación a la siguiente tarea:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender ha rechazado su asignación a la siguiente tarea:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodyin-process'] = "\$sender ha establecido el estado de la siguiente tarea a: en proceso:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodycompleted'] = "\$sender ha completado la tarea siguiente:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegated'] = "\$sender ha delegado la tarea siguiente:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ha delegado la tarea siguiente para usted:\n\n*\$title*\n\nDue: \$date";
+$labels['attendeeaccepted'] = 'Asignado ha aceptado';
+$labels['attendeetentative'] = 'Asignado ha aceptado provisionalmente';
+$labels['attendeedeclined'] = 'Asignado ha declinado';
+$labels['attendeedelegated'] = 'Asignado ha delegado a $delegatedto';
+$labels['attendeein-process'] = 'Asignado está en proceso';
+$labels['attendeecompleted'] = 'Asignado ha completado';
+$labels['acceptinvitation'] = '¿Acepta esta tarea?';
+$labels['itipdeclinetask'] = 'Rechazar su asignación a esta tarea al organizador';
+$labels['declinedeleteconfirm'] = '¿Usted también desea eliminar esta tarea declinada de su lista de tareas?';
+$labels['itipcomment'] = 'Añadir comentarios a la Invitación/notificación';
+$labels['itipcommenttitle'] = 'Este comentario se adjunta al mensaje de invitación/notificación enviada a los asignados.';
+$labels['itipsendsuccess'] = 'La notificación enviada a los asignados';
+$labels['errornotifying'] = 'No se ha podido enviar la notificación a los asignados de esta tarea';
+$labels['removefromcalendar'] = 'Borrar de mis tareas';
+$labels['delegateinvitation'] = 'Delegar asignación';
+$labels['andnmore'] = '$nr más...';
+$labels['savetotasklist'] = 'Salvar a las tareas';
 $labels['comment'] = 'Comentario';
+$labels['rsvpcomment'] = 'Comentario';
+$labels['errorimportingtask'] = 'Fallo al importar la(s) tarea(s)';
+$labels['importwarningexists'] = 'Una copia de esta tarea ya existe en su lista de tareas.';
+$labels['importsuccess'] = 'Se ha importado $nr tareas correctamente';
+$labels['importerror'] = 'Se ha producido un error durante la importación';
+$labels['newerversionexists'] = 'Una nueva versión de esta tarea ya existe! Cancelado.';
+$labels['nowritetasklistfound'] = 'No se encontraron listas de tareas para guardar la tarea';
+$labels['importedsuccessfully'] = 'La tarea ha sido añadido a \'$list\'';
+$labels['updatedsuccessfully'] = 'La tarea se ha actualizado correctamente en \'$list\'';
+$labels['attendeupdateesuccess'] = 'Se ha actualizado correctamente el estado del participante';
+$labels['itipresponseerror'] = 'No se pudo enviar la respuesta a esta asignación de tareas';
+$labels['itipinvalidrequest'] = 'Esta invitación ya no es válida';
+$labels['sentresponseto'] = 'Respuesta de asignación con éxito enviada a $mailto';
+$labels['successremoval'] = 'La tarea se ha eliminado correctamente.';
+$labels['invalidlistproperties'] = 'Las propiedades de la lista no son válidas. Establezca un nombre válido.';
diff --git a/plugins/tasklist/localization/et_EE.inc b/plugins/tasklist/localization/et_EE.inc
index 2b849ea3..a97709e4 100644
--- a/plugins/tasklist/localization/et_EE.inc
+++ b/plugins/tasklist/localization/et_EE.inc
@@ -6,8 +6,103 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
+$labels['navtitle'] = 'Ülesanded';
+$labels['lists'] = 'Ülesannete nimekiri';
+$labels['list'] = 'Ülesannete nimekiri';
+$labels['tags'] = 'Sildid';
+$labels['export'] = 'Ekspordi';
+$labels['exporttitle'] = 'Ekspordi iCalendar-isse';
+$labels['exportattachments'] = 'Manusega';
+$labels['currentview'] = 'praegune vaade';
+$labels['listsearchresults'] = 'Saadaolevad ülesannete nimekirjad';
+$labels['notasklistsfound'] = 'Ühtegi ülesannete nimekirja ei leitud';
+$labels['nrtasklistsfound'] = 'Leiti $nr ülesannete nimekirja';
+$labels['removelist'] = 'Eemalda nimekirjast';
+$labels['newtask'] = 'Uus ülesanne';
+$labels['createtask'] = 'Loo ülesanne <Enter>';
+$labels['createfrommail'] = 'Salvesta ülesandena';
+$labels['printdescriptions'] = 'Prindi kirjeldused';
+$labels['edit'] = 'Muuda';
 $labels['delete'] = 'Kustuta';
 $labels['title'] = 'Pealkiri';
+$labels['description'] = 'Kirjeldus';
+$labels['datetime'] = 'Tähtaeg';
+$labels['duetime'] = 'Tähtaeg';
+$labels['start'] = 'Algus';
+$labels['starttime'] = 'Alustamise aeg';
+$labels['alarms'] = 'Meeldetuletus';
+$labels['repeat'] = 'Kordamine';
+$labels['links'] = 'Viide';
+$labels['status'] = 'Staatus';
+$labels['status-in-process'] = 'Töös';
+$labels['status-completed'] = 'Lõpetatud';
+$labels['status-cancelled'] = 'Tühistatud';
+$labels['assignedto'] = 'Määratud kasutajale';
+$labels['created'] = 'Loodud';
+$labels['changed'] = 'Viimati muudetud';
+$labels['taskoptions'] = 'Valikud';
+$labels['all'] = 'Kõik';
+$labels['complete'] = 'Valmis';
+$labels['completeness'] = 'Edenemine';
+$labels['overdue'] = 'Tähtaja ületanud';
+$labels['today'] = 'Täna';
+$labels['tomorrow'] = 'Homme';
+$labels['later'] = 'Hiljem';
+$labels['assigned'] = 'Määratud';
+$labels['assignedtitle'] = 'Teistele määratud ülesanded';
+$labels['mytasks'] = 'Minu ülesanded';
+$labels['mytaskstitle'] = 'Sulle määratud ülesanded';
+$labels['nodate'] = 'kuupäeva pole';
+$labels['removetag'] = 'Eemalda';
+$labels['auto'] = 'Automaatne';
+$labels['newtask'] = 'Uus ülesanne';
+$labels['edittask'] = 'Muuda ülesannet';
 $labels['save'] = 'Salvesta';
+$labels['cancel'] = 'Loobu';
+$labels['saveandnotify'] = 'Salvesta ja teavita';
+$labels['addsubtask'] = 'Lisa alamülesanne';
+$labels['deletetask'] = 'Kustuta ülesanne';
+$labels['deletethisonly'] = 'Kustuta ainult see ülesanne';
+$labels['deletewithchilds'] = 'Kustuta koos kõigi alamülesannetega';
+$labels['taskactions'] = 'Ülesande valikud...';
+$labels['tabsummary'] = 'Kokkuvõte';
+$labels['tabrecurrence'] = 'Kordumine';
+$labels['tabattachments'] = 'Manused';
+$labels['tabsharing'] = 'Jagamine';
+$labels['editlist'] = 'Muuda nimekirja';
+$labels['createlist'] = 'Lisa nimekiri';
+$labels['listactions'] = 'Nimekirja valikud...';
+$labels['listname'] = 'Nimi';
+$labels['showalarms'] = 'Näita meeldetuletusi';
+$labels['import'] = 'Impordi';
+$labels['viewactions'] = 'Vaata toiminguid';
+$labels['focusview'] = 'Vaata ainult seda nimekirja';
+$labels['next'] = 'järgmine';
+$labels['yes'] = 'jah';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['errorsaving'] = 'Andmete salvestamine ebaõnnestus.';
+$labels['changetaskconfirm'] = 'Uuenda ülesannet';
+$labels['quickaddinput'] = 'Uue ülesande kuupäev ja pealkiri';
+$labels['arialabelquickaddbox'] = 'Uue ülesande kiire lisamine';
+$labels['arialabelsearchform'] = 'Ülesande otsimise vorm';
+$labels['arialabellistsearchform'] = 'Ülesandenimekirjade otsimise vorm';
+$labels['arialabeltasklisting'] = 'Ülesannete nimekirjad';
+$labels['arialabelsortmenu'] = 'Ülesannete sorteerimise valikud';
+$labels['role'] = 'Roll';
+$labels['availability'] = 'Saadaval';
+$labels['confirmstate'] = 'Staatus';
+$labels['roleorganizer'] = 'Organiseerija';
 $labels['rolerequired'] = 'Kohustuslik';
+$labels['roleoptional'] = 'Valikuline';
+$labels['rolenonparticipant'] = 'Jälgija';
+$labels['sendinvitations'] = 'Saada kutsed';
+$labels['taskhistory'] = 'Ajalugu';
+$labels['objectchangelog'] = 'Muuda ajalugu';
+$labels['objectdiff'] = 'Muudatused versioonide $rev1 ja $rev2 vahel';
+$labels['removefromcalendar'] = 'Eemalda minu ülesannete nimekirjast';
+$labels['andnmore'] = 'veel $nr ...';
+$labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Kommentaar';
+$labels['rsvpcomment'] = 'Kommentaar';
+$labels['importerror'] = 'Importimisel tekkis tõrge';
+$labels['itipinvalidrequest'] = 'See kutse ei kehti enam';
diff --git a/plugins/tasklist/localization/fi_FI.inc b/plugins/tasklist/localization/fi_FI.inc
index 8c82ab17..b9ecb2dd 100644
--- a/plugins/tasklist/localization/fi_FI.inc
+++ b/plugins/tasklist/localization/fi_FI.inc
@@ -10,9 +10,14 @@ $labels['navtitle'] = 'Tehtävät';
 $labels['lists'] = 'Tehtävätlistat';
 $labels['list'] = 'Tehtävälista';
 $labels['tags'] = 'Tunnisteet';
+$labels['export'] = 'Vie';
+$labels['exporttitle'] = 'Vie iCalendar-muotoon';
+$labels['exportattachments'] = 'Liitteiden kanssa';
+$labels['currentview'] = 'nykyinen näkymä';
 $labels['tasklistsubscribe'] = 'Luetteloi pysyvästi';
 $labels['listsearchresults'] = 'Käytettävissä olevat tehtävälistat';
 $labels['findlists'] = 'Etsi tehtävälistoja...';
+$labels['findtasks'] = 'Etsi tehtäviä...';
 $labels['searchterms'] = 'Hakuehdot';
 $labels['notasklistsfound'] = 'Tehtävälistaa ei löytynyt';
 $labels['nrtasklistsfound'] = '$nr tehtävälistaa löytyi';
@@ -40,29 +45,35 @@ $labels['repeat'] = 'Toista';
 $labels['links'] = 'Viittaus';
 $labels['status'] = 'Tila';
 $labels['status-needs-action'] = 'Vaatii toimenpiteitä';
+$labels['status-in-process'] = 'Prosessissa';
 $labels['status-completed'] = 'Valmis';
 $labels['status-cancelled'] = 'Peruttu';
+$labels['assignedto'] = 'Määritetty henkilölle';
 $labels['created'] = 'Luotu';
 $labels['changed'] = 'Viimeksi muokattu';
+$labels['taskoptions'] = 'Valinnat';
 $labels['all'] = 'Kaikki';
 $labels['flagged'] = 'Liputettu';
 $labels['complete'] = 'Valmiina';
+$labels['completeness'] = 'Edistyminen';
 $labels['overdue'] = 'Myöhässä';
 $labels['today'] = 'Tänään';
 $labels['tomorrow'] = 'Huomenna';
 $labels['next7days'] = 'Seuraavat 7 päivää';
 $labels['later'] = 'Myöhemmin';
+$labels['assigned'] = 'Siirretyt';
 $labels['assignedtitle'] = 'Tehtävät, jotka määritit muille';
 $labels['mytasks'] = 'Omat tehtävät';
 $labels['mytaskstitle'] = 'Sinulle määritetyt tehtävät';
 $labels['nodate'] = 'ei päivää';
 $labels['removetag'] = 'Poista';
 $labels['removelink'] = 'Poista sähköpostiviittaus';
-$labels['taskdetails'] = 'Tiedot';
+$labels['taskdetails'] = 'Tehtävän tiedot';
 $labels['newtask'] = 'Uusi tehtävä';
 $labels['edittask'] = 'Muokkaa tehtävää';
 $labels['save'] = 'Tallenna';
 $labels['cancel'] = 'Peru';
+$labels['saveandnotify'] = 'Tallenna ja huomauta';
 $labels['addsubtask'] = 'Lisää alitehtävä';
 $labels['deletetask'] = 'Poista tehtävä';
 $labels['deletethisonly'] = 'Poista vain tämä tehtävä';
@@ -78,7 +89,9 @@ $labels['listactions'] = 'Listan valinnat...';
 $labels['listname'] = 'Nimi';
 $labels['showalarms'] = 'Näytä muistutukset';
 $labels['import'] = 'Tuo';
+$labels['importtasks'] = 'Tuo tehtäviä';
 $labels['viewactions'] = 'Näytä toiminnot';
+$labels['yes'] = 'kyllä';
 $labels['savingdata'] = 'Tallennetaan tietoja...';
 $labels['errorsaving'] = 'Tietojen tallenntaminen epäonnistui.';
 $labels['notasksfound'] = 'Ehtoja vastaavia tehtäviä ei löytynyt';
@@ -90,6 +103,7 @@ $labels['deletelistconfirm'] = 'Haluatko varmasti poistaa tämän listan ja sen
 $labels['deletelistconfirmrecursive'] = 'Haluatko varmasti poistaa tämän listan, sen alilistat ja tehtävät?';
 $labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän tehtävälistaan.';
 $labels['changetaskconfirm'] = 'Päivitä tehtävä';
+$labels['partstatupdatenotification'] = 'Haluatko huomauttaa järjestäjää tilamuutoksesta?';
 $labels['arialabelquickaddbox'] = 'Tehtävän pikalisäys';
 $labels['role'] = 'Rooli';
 $labels['availability'] = 'Saatavilla';
@@ -99,18 +113,28 @@ $labels['rolerequired'] = 'Vaadittu';
 $labels['roleoptional'] = 'Valinnainen';
 $labels['rolechair'] = 'Kutsuja';
 $labels['sendinvitations'] = 'Lähetä kutsut';
+$labels['invitationsubject'] = 'Sinut on määritetty tehtävään "$title"';
 $labels['itipupdatesubject'] = '"$title" on päivitetty';
+$labels['itipupdatesubjectempty'] = 'Sinua koskeva tehtävä on päivitetty';
 $labels['itipcancelsubject'] = '"$title" on peruttu';
+$labels['taskhistory'] = 'Historia';
+$labels['objectchangelog'] = 'Muutoshistoria';
+$labels['objectdiff'] = 'Muutokset versiosta $rev1 versioon $rev2';
+$labels['objectnotfound'] = 'Tehtävän tietojen lataaminen epäonnistui';
+$labels['objectchangelognotavailable'] = 'Muutoshistoria ei ole käytettävissä tälle tehtävälle';
+$labels['objectdiffnotavailable'] = 'Valituille versioille ei ole mahdollista tehdä vertailua';
+$labels['objectrestoresuccess'] = 'Versio $rev palautettu onnistuneesti';
+$labels['objectrestoreerror'] = 'Vanhan version palauttaminen epäonnistui';
 $labels['itipcomment'] = 'Kutsun/herätteen kommentit';
 $labels['removefromcalendar'] = 'Poista omista tehtävistä';
 $labels['andnmore'] = '$nr lisää...';
-$labels['delegatedto'] = 'Delegoitu henkilölle:';
-$labels['delegatedfrom'] = 'Delegoitus henkilöltä:';
 $labels['savetotasklist'] = 'Tallenna tehtäviin';
 $labels['comment'] = 'Kommentti';
+$labels['rsvpcomment'] = 'Kommentti';
 $labels['errorimportingtask'] = 'Tehtävien tuonti epäonnistui';
 $labels['importwarningexists'] = 'Kopio tästä tehtävästä on jo olemassa tehtävälistassasi.';
 $labels['importsuccess'] = '$nr tehtävää tuotiin onnistuneesti';
+$labels['importerror'] = 'Tuotaessa tapahtui virhe';
 $labels['newerversionexists'] = 'Tästä tehtävästä on jo uudempi versio! Peruttiin toiminto.';
 $labels['nowritetasklistfound'] = 'Ei löytynyt tehtävälistaa, johon tallentaa tehtävä';
 $labels['importedsuccessfully'] = 'Tehtävä lisättiin listaan \'$list\'';
diff --git a/plugins/tasklist/localization/fr_FR.inc b/plugins/tasklist/localization/fr_FR.inc
index 8ae392b4..93ec07c0 100644
--- a/plugins/tasklist/localization/fr_FR.inc
+++ b/plugins/tasklist/localization/fr_FR.inc
@@ -10,17 +10,24 @@ $labels['navtitle'] = 'Tâches';
 $labels['lists'] = 'Liste des tâches';
 $labels['list'] = 'Liste de tâche';
 $labels['tags'] = 'Étiquettes';
+$labels['export'] = 'Exporter';
+$labels['exporttitle'] = 'Exporter vers iCalendar';
+$labels['exportattachments'] = 'Avec pièces jointes';
+$labels['currentview'] = 'stade actuel';
 $labels['tasklistsubscribe'] = 'Lister définitivement';
-$labels['listsearchresults'] = 'Listes de Tâche disponibles';
-$labels['findlists'] = 'Trouver listes de Tache....';
+$labels['listsearchresults'] = 'Listes des tâches disponibles';
+$labels['findlists'] = 'Trouver listes de tâches...';
 $labels['searchterms'] = 'Critères de recherche';
 $labels['notasklistsfound'] = 'Aucune liste de tâches trouvée';
 $labels['nrtasklistsfound'] = '$nr listes de tâches trouvées';
-$labels['removelist'] = 'supprimer de la liste';
+$labels['removelist'] = 'Supprimer de la liste';
+$labels['showcaldavurl'] = 'Afficher l\'URL CalDAV';
+$labels['caldavurldescription'] = 'Copier cette adresse vers une application cliente compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (par exemple Evolution et Mozilla Thunderbird) afin de synchroniser cette liste de tâches spécifique avec votre ordinateur ou votre smartphone.';
 $labels['newtask'] = 'Nouvelle tâche';
 $labels['createtask'] = 'Créer une tâche <Entrer>';
 $labels['createnewtask'] = 'Créer une nouvelle tâche (ex : Samedi, tondre la pelouse)';
-$labels['createfrommail'] = 'Sauvegarder comme une tâche';
+$labels['createfrommail'] = 'Sauvegarder en tant que tâche';
+$labels['printtitle'] = 'Imprimer tâches';
 $labels['printdescriptions'] = 'Imprimer les descriptions';
 $labels['mark'] = 'Sélectionner';
 $labels['unmark'] = 'Désélectionner';
@@ -43,6 +50,7 @@ $labels['status-cancelled'] = 'Annulée';
 $labels['assignedto'] = 'Affectée à';
 $labels['created'] = 'Créée';
 $labels['changed'] = 'Dernière modification';
+$labels['taskoptions'] = 'Options';
 $labels['all'] = 'Tous';
 $labels['flagged'] = 'Marqué';
 $labels['complete'] = 'Terminé';
@@ -53,14 +61,13 @@ $labels['tomorrow'] = 'Demain';
 $labels['next7days'] = '7 prochains jours';
 $labels['later'] = 'Plus tard';
 $labels['assigned'] = 'Affectée';
-$labels['assignedtitle'] = 'Tâches que vous avez affecté à d\'autres';
+$labels['assignedtitle'] = 'Tâches que vous avez affectée à d\'autres';
 $labels['mytasks'] = 'Mes tâches';
 $labels['mytaskstitle'] = 'Tâches qui me sont affectées';
-$labels['nodate'] = 'Pas de date';
+$labels['nodate'] = 'pas de date';
 $labels['removetag'] = 'Supprimer';
 $labels['removelink'] = 'Enlever référence d\'e-mail';
 $labels['auto'] = 'Automatique';
-$labels['taskdetails'] = 'Détails';
 $labels['newtask'] = 'Nouvelle tâche';
 $labels['edittask'] = 'Modifier la tâche';
 $labels['save'] = 'Enregistrer';
@@ -68,7 +75,7 @@ $labels['cancel'] = 'Annuler';
 $labels['saveandnotify'] = 'Enregistrer et notifier';
 $labels['addsubtask'] = 'Ajouter une sous-tâche';
 $labels['deletetask'] = 'Supprimer la tâche';
-$labels['deletethisonly'] = 'Supprimer seulement cette tâche';
+$labels['deletethisonly'] = 'Supprimer cette tâche seulement';
 $labels['deletewithchilds'] = 'Supprimer avec toutes les sous-tâches';
 $labels['taskactions'] = 'Options de la tâche...';
 $labels['tabsummary'] = 'Résumé';
@@ -88,25 +95,29 @@ $labels['on'] = 'sur';
 $labels['at'] = 'à';
 $labels['this'] = 'ce';
 $labels['next'] = 'suivant';
+$labels['yes'] = 'oui';
 $labels['savingdata'] = 'Enregistrer...';
-$labels['errorsaving'] = 'Échec lors de la sauvegarde des donnés';
-$labels['notasksfound'] = 'Pas de tâche trouvé avec les critères sélectionnés';
-$labels['invalidstartduedates'] = 'La date de début ne doit pas être supérieur à la date de fin';
-$labels['deletetasktconfirm'] = 'Êtes-vous sur de vouloir supprimer cette tâche?';
-$labels['deleteparenttasktconfirm'] = 'Êtes-vous sur de vouloir supprimer cette tâche et ses sous-tâches?';
-$labels['deletelistconfirm'] = 'Êtes-vous sur de vouloir supprimer cette liste et toutes ses tâches?';
-$labels['deletelistconfirmrecursive'] = 'Voulez-vous vraiment supprimer cette liste avec tous ses sous-listes et tâches?';
-$labels['aclnorights'] = 'Vous ne disposez pas des droits d´ administrateur pour cette liste de tâches.';
+$labels['errorsaving'] = 'Échec lors de la sauvegarde des donnés.';
+$labels['notasksfound'] = 'Pas de tâche trouvée avec les critères sélectionnés';
+$labels['invalidstartduedates'] = 'La date de début ne doit pas être ultérieure à la date de fin';
+$labels['invalidstartduetimes'] = 'Les dates de début et de fin d\'échéance doivent toutes deux spécifier une heure, ou non.';
+$labels['recurrencerequiresdate'] = 'Les tâches récurrentes exigent une date de début ou de fin d\'échéance.';
+$labels['deletetasktconfirm'] = 'Êtes-vous sûr de vouloir supprimer cette tâche ?';
+$labels['deleteparenttasktconfirm'] = 'Êtes-vous sûr de vouloir supprimer cette tâche et ses sous-tâches ?';
+$labels['deletelistconfirm'] = 'Êtes-vous sûr de vouloir supprimer cette liste et toutes ses tâches ?';
+$labels['deletelistconfirmrecursive'] = 'Voulez-vous vraiment supprimer cette liste avec toutes ses sous-listes et tâches ?';
+$labels['aclnorights'] = 'Vous ne disposez pas des droits d\'administrateur pour cette liste de tâches.';
 $labels['changetaskconfirm'] = 'Modifier la tâche';
-$labels['changeconfirmnotifications'] = 'Voulez-vous avertir les invitées à propos de cette modification ?';
-$labels['partstatupdatenotification'] = 'Voulez-vous avertir l\'organisateur a propos du changement de statut ?';
+$labels['changeconfirmnotifications'] = 'Voulez-vous avertir les invités de cette modification ?';
+$labels['partstatupdatenotification'] = 'Voulez-vous avertir l\'organisateur du changement de statut ?';
 $labels['quickaddinput'] = 'Nouvelle tâche, date et titre';
 $labels['arialabelquickaddbox'] = 'Ajout rapide d\'une nouvelle tâche';
-$labels['arialabelsearchform'] = 'Recherche de tâches';
-$labels['arialabelquicksearchbox'] = 'Saisie d\'une recherche de tâche';
-$labels['arialabellistsearchform'] = 'Recherche de listes de tâches';
+$labels['arialabelsearchform'] = 'Formulaire de recherche de tâches';
+$labels['arialabelquicksearchbox'] = 'Saisie d\'une recherche de tâches';
+$labels['arialabellistsearchform'] = 'Formulaire de recherche de listes de tâches';
 $labels['arialabeltaskselector'] = 'Type de liste';
 $labels['arialabeltasklisting'] = 'Liste des tâches';
+$labels['arialabelsortmenu'] = 'Options de tri des tâches';
 $labels['attendee'] = 'Utilisateurs affectés';
 $labels['role'] = 'Rôle';
 $labels['availability'] = 'Dispo.';
@@ -114,55 +125,67 @@ $labels['confirmstate'] = 'Statut';
 $labels['addattendee'] = 'Affecter un utilisateur';
 $labels['roleorganizer'] = 'Organisateur';
 $labels['rolerequired'] = 'Requis';
-$labels['roleoptional'] = 'Optionel';
+$labels['roleoptional'] = 'Optionnel';
+$labels['rolechair'] = 'Présidence';
 $labels['rolenonparticipant'] = 'Observateur';
 $labels['sendinvitations'] = 'Envoyer les invitations';
-$labels['sendnotifications'] = 'Avertir les utilisateurs concernant les modifications';
-$labels['sendcancellation'] = 'Avertir les utilisateurs concernant l\'annulation de la tâche';
+$labels['sendnotifications'] = 'Avertir les utilisateurs des modifications';
+$labels['sendcancellation'] = 'Avertir les utilisateurs de l\'annulation de la tâche';
 $labels['invitationsubject'] = 'Vous avez été affecté à la tâche "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nFin: \$date\n\nAffectée à : \$attendees\n\nVous trouverez en attachement un objet de type iCalendar comprenant le détail de cette tâche et que vous pouvez importer dans votre gestionnaire de tâches.";
 $labels['itipupdatesubject'] = '"$title" a été modifié';
 $labels['itipupdatesubjectempty'] = 'Une tâche vous concernant a été modifiée';
 $labels['itipupdatemailbody'] = "*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees\n\nVous trouverez en attachement un objet de type iCalendar comprenant le détail de cette tâche modifiée et que vous pouvez importer dans votre gestionnaire de tâches.";
 $labels['itipcancelsubject'] = '"$title" a été annulé';
-$labels['itipcancelmailbody'] = "*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees\n\nLa tâche a été supprimée par \$organizer.\n\nous trouverez en attachement un objet de type iCalendar comprenant le détail de cette tâche.";
-$labels['saveintasklist'] = 'Sauvegardé dans';
+$labels['itipcancelmailbody'] = "*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees\n\nLa tâche a été supprimée par \$organizer.\n\Vous trouverez en pièce jointe un objet de type iCalendar comprenant le détail de cette tâche.";
+$labels['saveintasklist'] = 'sauvegardé dans';
+$labels['taskhistory'] = 'Historique';
+$labels['objectchangelog'] = 'Historique des modifications';
+$labels['objectdiff'] = 'Modifications de $rev1 à $rev2';
+$labels['objectnotfound'] = 'Échec lors du chargement des données de tâches';
+$labels['objectchangelognotavailable'] = 'Il n\'y a pas d\'historique des modifications pour cette tâche';
+$labels['objectdiffnotavailable'] = 'La comparaison des versions sélectionnées est impossible';
+$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer la version $rev de cette tâche ? Ceci remplacera l\'événement actuel par l\'ancienne version.';
+$labels['objectrestoresuccess'] = 'La révision $rev a été restaurée avec succès';
+$labels['objectrestoreerror'] = 'Échec lors de la restauration de la précédente révision';
 $labels['itipobjectnotfound'] = 'La tâche correspondant à ce massage n\'a pas été trouvée dans votre liste de têches.';
 $labels['itipmailbodyaccepted'] = "\$sender a accepté l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees";
 $labels['itipmailbodytentative'] = "\$sender va tenter d’accepter l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender ne pourra probablement pas accepter l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date\n\nAffectée à: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender a refusé l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date";
-$labels['itipmailbodyin-process'] = "\$sender a fixer le statut de la tâche suivante dans l'état \"en cours de traitement\"  :\n\n*\$title*\n\nFin : \$date";
+$labels['itipmailbodyin-process'] = "\$sender a fixé le statut de la tâche suivante dans l'état \"en cours de traitement\"  :\n\n*\$title*\n\nFin : \$date";
 $labels['itipmailbodycompleted'] = "\$sender a fini la tâche suivante :\n\n*\$title*\n\nFin: \$date";
+$labels['itipmailbodydelegated'] = "\$sender a délégué la tâche suivante :\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender vous a délégué la tâche suivante :\n\n*\$title*\n\nDue: \$date";
 $labels['attendeeaccepted'] = 'L\'utilisateur a accepté l\'affectation';
-$labels['attendeetentative'] = 'L\'utilisateur va tenté d\'accepter l\'affectation';
+$labels['attendeetentative'] = 'L\'utilisateur a tenté d\'accepter l\'affectation';
 $labels['attendeedeclined'] = 'L\'utilisateur a décliné l\'affectation';
-$labels['attendeedelegated'] = 'L\'affectation a été délégué à $delegatedto';
+$labels['attendeedelegated'] = 'L\'affectation a été déléguée à $delegatedto';
 $labels['attendeein-process'] = 'Cette tâche est en cours de traitement par les utilisateurs affectés';
-$labels['attendeecompleted'] = 'Cette tâche a été traité par les utilisateurs affectés';
-$labels['acceptinvitation'] = 'Acceptez-vous cet affectation ?';
-$labels['itipdeclinetask'] = 'Décline à l\'organisateur votre affectation à cette tâche';
+$labels['attendeecompleted'] = 'Cette tâche a été traitée par les utilisateurs affectés';
+$labels['acceptinvitation'] = 'Acceptez-vous cette affectation ?';
+$labels['itipdeclinetask'] = 'Déclinez votre affectation à cette tâche auprès de l\'organisateur';
 $labels['declinedeleteconfirm'] = 'Voulez-vous supprimer cette tâche déclinée de votre liste ?';
 $labels['itipcomment'] = 'Commentaire d’invitation ou de notification';
-$labels['itipcommenttitle'] = 'Ce commentaire sera inséré au message d\'invitation envoyé aux utilisateurs affectés';
+$labels['itipcommenttitle'] = 'Ce commentaire sera inséré au message d\'invitation/de notification envoyé aux utilisateurs affectés';
 $labels['itipsendsuccess'] = 'Notification envoyée aux utilisateurs assignés';
 $labels['errornotifying'] = 'Erreur d\'envoi des notifications aux utilisateurs affectés à la tâche';
 $labels['removefromcalendar'] = 'Supprimer de mes tâches';
+$labels['delegateinvitation'] = 'Déléguer l\'affectation';
 $labels['andnmore'] = '$nr de plus...';
-$labels['delegatedto'] = 'Délégué à :';
-$labels['delegatedfrom'] = 'Délégué de :';
 $labels['savetotasklist'] = 'Sauvegarde des tâches';
 $labels['comment'] = 'Commentaire';
+$labels['rsvpcomment'] = 'Commentaire';
 $labels['errorimportingtask'] = 'Importation impossible';
 $labels['importwarningexists'] = 'Une copie de cette tâche existe déjà dans votre liste.';
 $labels['importsuccess'] = '$nr tâches ont été importées avec succès';
+$labels['importerror'] = 'Une erreur s\'est produite lors de l\'importation';
 $labels['newerversionexists'] = 'Une version plus récente de cette tâche existe déjà ! Abandon.';
 $labels['nowritetasklistfound'] = 'Aucune liste trouvée pour sauvegarder cette tâche';
 $labels['importedsuccessfully'] = 'Cette tâche a été ajoutée avec succès à \'$list\'';
 $labels['updatedsuccessfully'] = 'Cette tâche a été modifiée avec succès dans \'$list\'';
 $labels['attendeupdateesuccess'] = 'Le statut des participants a été modifié';
 $labels['itipresponseerror'] = 'Impossible d\'envoyer la réponse de l\'utilisateur affecté à la tâche';
-$labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide.';
-$labels['sentresponseto'] = 'La réponse de l\'utilisateur affecté a été envoyé avec succès à $mailto';
+$labels['itipinvalidrequest'] = 'Cette invitation n\'est plus valide';
+$labels['sentresponseto'] = 'La réponse de l\'utilisateur affecté a été envoyée avec succès à $mailto';
 $labels['successremoval'] = 'Cette tâche a été supprimée avec succès.';
-$labels['arialabelsortmenu'] = 'Options de tri des tâches';
+$labels['invalidlistproperties'] = 'Propriétés de la liste invalides ! Veuillez saisir un nom valide.';
diff --git a/plugins/tasklist/localization/he_IL.inc b/plugins/tasklist/localization/he_IL.inc
new file mode 100644
index 00000000..607fe623
--- /dev/null
+++ b/plugins/tasklist/localization/he_IL.inc
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['export'] = 'Export';
+$labels['exporttitle'] = 'Export to iCalendar';
+$labels['exportattachments'] = 'With attachments';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['searchterms'] = 'Search terms';
+$labels['removelist'] = 'Remove from list';
+$labels['printdescriptions'] = 'Print descriptions';
+$labels['edit'] = 'Edit';
+$labels['description'] = 'Description';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
+$labels['alarms'] = 'Reminder';
+$labels['repeat'] = 'Repeat';
+$labels['status'] = 'Status';
+$labels['status-cancelled'] = 'Cancelled';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['taskoptions'] = 'Options';
+$labels['all'] = 'All';
+$labels['today'] = 'Today';
+$labels['tomorrow'] = 'Tomorrow';
+$labels['save'] = 'Save';
+$labels['cancel'] = 'Cancel';
+$labels['tabsummary'] = 'Summary';
+$labels['tabrecurrence'] = 'Recurrence';
+$labels['tabattachments'] = 'Attachments';
+$labels['tabsharing'] = 'Sharing';
+$labels['listname'] = 'Name';
+$labels['showalarms'] = 'Show reminders';
+$labels['savingdata'] = 'Saving data...';
+$labels['role'] = 'Role';
+$labels['availability'] = 'Avail.';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organizer';
+$labels['rolerequired'] = 'Required';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Chair';
+$labels['sendinvitations'] = 'Send invitations';
+$labels['itipupdatesubject'] = '"$title" has been updated';
+$labels['taskhistory'] = 'History';
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['andnmore'] = '$nr more...';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
+$labels['importerror'] = 'An error occured while importing';
+$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
diff --git a/plugins/tasklist/localization/hr_HR.inc b/plugins/tasklist/localization/hr_HR.inc
new file mode 100644
index 00000000..607fe623
--- /dev/null
+++ b/plugins/tasklist/localization/hr_HR.inc
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['export'] = 'Export';
+$labels['exporttitle'] = 'Export to iCalendar';
+$labels['exportattachments'] = 'With attachments';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['searchterms'] = 'Search terms';
+$labels['removelist'] = 'Remove from list';
+$labels['printdescriptions'] = 'Print descriptions';
+$labels['edit'] = 'Edit';
+$labels['description'] = 'Description';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
+$labels['alarms'] = 'Reminder';
+$labels['repeat'] = 'Repeat';
+$labels['status'] = 'Status';
+$labels['status-cancelled'] = 'Cancelled';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['taskoptions'] = 'Options';
+$labels['all'] = 'All';
+$labels['today'] = 'Today';
+$labels['tomorrow'] = 'Tomorrow';
+$labels['save'] = 'Save';
+$labels['cancel'] = 'Cancel';
+$labels['tabsummary'] = 'Summary';
+$labels['tabrecurrence'] = 'Recurrence';
+$labels['tabattachments'] = 'Attachments';
+$labels['tabsharing'] = 'Sharing';
+$labels['listname'] = 'Name';
+$labels['showalarms'] = 'Show reminders';
+$labels['savingdata'] = 'Saving data...';
+$labels['role'] = 'Role';
+$labels['availability'] = 'Avail.';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organizer';
+$labels['rolerequired'] = 'Required';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Chair';
+$labels['sendinvitations'] = 'Send invitations';
+$labels['itipupdatesubject'] = '"$title" has been updated';
+$labels['taskhistory'] = 'History';
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['andnmore'] = '$nr more...';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
+$labels['importerror'] = 'An error occured while importing';
+$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
diff --git a/plugins/tasklist/localization/hu_HU.inc b/plugins/tasklist/localization/hu_HU.inc
index 5576503a..39f9ae6d 100644
--- a/plugins/tasklist/localization/hu_HU.inc
+++ b/plugins/tasklist/localization/hu_HU.inc
@@ -10,7 +10,18 @@ $labels['navtitle'] = 'Feladatok';
 $labels['lists'] = 'Feladatlisták';
 $labels['list'] = 'Feladatlista';
 $labels['tags'] = 'Kulcsszavak';
+$labels['export'] = 'Exportálás';
+$labels['exporttitle'] = 'Exportálás iCalendar-ba';
+$labels['exportattachments'] = 'Csatolmányokkal';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['listsearchresults'] = 'Available Tasklists';
+$labels['findlists'] = 'Find tasklists...';
+$labels['searchterms'] = 'Search terms';
+$labels['notasklistsfound'] = 'No tasklists found';
+$labels['nrtasklistsfound'] = '$nr tasklists found';
+$labels['removelist'] = 'Remove from list';
 $labels['newtask'] = 'Új feladat';
+$labels['createtask'] = 'Create Task <Enter>';
 $labels['createnewtask'] = 'Új feladat címe';
 $labels['createfrommail'] = 'Mentés feladatként';
 $labels['printdescriptions'] = 'Leírás nyomtatása';
@@ -21,31 +32,50 @@ $labels['delete'] = 'Törlés';
 $labels['title'] = 'Tárgy';
 $labels['description'] = 'Leírás';
 $labels['datetime'] = 'Határidő';
+$labels['duetime'] = 'Due time';
 $labels['start'] = 'Kezdet';
+$labels['starttime'] = 'Start time';
 $labels['alarms'] = 'Emlékeztető';
 $labels['repeat'] = 'Ismétlődik';
+$labels['links'] = 'Reference';
 $labels['status'] = 'Stát.';
+$labels['status-needs-action'] = 'Needs action';
+$labels['status-in-process'] = 'In process';
+$labels['status-completed'] = 'Completed';
+$labels['status-cancelled'] = 'Cancelled';
+$labels['assignedto'] = 'Assigned to';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
 $labels['all'] = 'Minden feladat';
 $labels['flagged'] = 'Jelölt';
 $labels['complete'] = 'Teljesített';
+$labels['completeness'] = 'Progress';
 $labels['overdue'] = 'Túllépett';
 $labels['today'] = 'Mai napi';
 $labels['tomorrow'] = 'Holnapi';
 $labels['next7days'] = 'Következő 7 napi';
 $labels['later'] = 'Későbbi';
+$labels['assigned'] = 'Assigned';
+$labels['assignedtitle'] = 'Tasks you assigned to others';
+$labels['mytasks'] = 'My tasks';
+$labels['mytaskstitle'] = 'Tasks assigned to you';
 $labels['nodate'] = 'Dátum nélküli';
 $labels['removetag'] = 'Eltávolítás';
-$labels['taskdetails'] = 'Részletek';
+$labels['removelink'] = 'Remove email reference';
+$labels['auto'] = 'Auto';
 $labels['newtask'] = 'Új feladat';
 $labels['edittask'] = 'Módosítás';
 $labels['save'] = 'Mentés';
 $labels['cancel'] = 'Mégse';
+$labels['saveandnotify'] = 'Save and Notify';
 $labels['addsubtask'] = 'Új részfeladat';
 $labels['deletetask'] = 'Törlés';
 $labels['deletethisonly'] = 'Csak ezen feladat törlése';
 $labels['deletewithchilds'] = 'Törlés részfeladatokkal együtt';
+$labels['taskactions'] = 'Task options...';
 $labels['tabsummary'] = 'Tárgy';
 $labels['tabrecurrence'] = 'Ismétlődés';
+$labels['tabassignments'] = 'Assignments';
 $labels['tabattachments'] = 'Mellékletek';
 $labels['tabsharing'] = 'Megosztás';
 $labels['editlist'] = 'Lista szerkesztése';
@@ -54,11 +84,13 @@ $labels['listactions'] = 'Lista beállítások...';
 $labels['listname'] = 'Név';
 $labels['showalarms'] = 'Emlékeztetők megjelenítése';
 $labels['import'] = 'Importálás';
+$labels['viewactions'] = 'View actions';
 $labels['focusview'] = 'Csak ezen lista megjelenítése';
 $labels['on'] = 'dátum';
 $labels['at'] = 'időpont';
 $labels['this'] = 'ezen';
 $labels['next'] = 'következő';
+$labels['yes'] = 'yes';
 $labels['savingdata'] = 'Adatok mentése...';
 $labels['errorsaving'] = 'Az adatok mentése nem sikerült';
 $labels['notasksfound'] = 'A megadott kritériumoknak nem felelt meg egy feladat sem';
@@ -67,16 +99,75 @@ $labels['deletetasktconfirm'] = 'Biztos benne, hogy törölni szeretné ezt a fe
 $labels['deleteparenttasktconfirm'] = 'DBiztos benne, hogy törölni szeretné ezt a feladatot, az összes részfeladattal együtt?';
 $labels['deletelistconfirm'] = 'Biztos benne, hogy törölni szeretné ezt a listát, az összes benne lévő feladattal együtt?';
 $labels['deletelistconfirmrecursive'] = 'Biztos benne, hogy törölni szeretné ezt a listát, az összes benne lévő listával és feladattal együtt?';
+$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
+$labels['changetaskconfirm'] = 'Update task';
+$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
+$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
+$labels['quickaddinput'] = 'New task date and title';
+$labels['arialabelquickaddbox'] = 'Quick add new task';
+$labels['arialabelsearchform'] = 'Task search form';
+$labels['arialabelquicksearchbox'] = 'Task search input';
+$labels['arialabellistsearchform'] = 'Tasklists search form';
+$labels['arialabeltaskselector'] = 'List mode';
+$labels['arialabeltasklisting'] = 'Tasks listing';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['attendee'] = 'Assignee';
 $labels['role'] = 'Szerepkör';
 $labels['availability'] = 'Elérh.';
 $labels['confirmstate'] = 'Stát.';
+$labels['addattendee'] = 'Add assignee';
 $labels['roleorganizer'] = 'Szervező';
 $labels['rolerequired'] = 'Kötelező';
 $labels['roleoptional'] = 'Opcionális';
 $labels['rolechair'] = 'Elnöklő';
+$labels['rolenonparticipant'] = 'Observer';
 $labels['sendinvitations'] = 'Meghívók küldése';
+$labels['sendnotifications'] = 'Notify assignees about modifications';
+$labels['sendcancellation'] = 'Notify assignees about task cancellation';
+$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
 $labels['itipupdatesubject'] = '$title - módosítva';
-$labels['itipcancelsubject'] = '$title - lemondva';
+$labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
+$labels['saveintasklist'] = 'save in ';
+$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
+$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegated'] = "\$sender has delegated the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender has delegated the following task to you:\n\n*\$title*\n\nDue: \$date";
+$labels['attendeeaccepted'] = 'Assignee has accepted';
+$labels['attendeetentative'] = 'Assignee has tentatively accepted';
+$labels['attendeedeclined'] = 'Assignee has declined';
+$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
+$labels['attendeein-process'] = 'Assignee is in-process';
+$labels['attendeecompleted'] = 'Assignee has completed';
+$labels['acceptinvitation'] = 'Do you accept this assignment?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Notification sent to assignees';
+$labels['errornotifying'] = 'Failed to send notifications to task assignees';
+$labels['removefromcalendar'] = 'Remove from my tasks';
+$labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = 'még $nr ...';
-$labels['delegatedto'] = 'Beosztva ide: ';
-$labels['delegatedfrom'] = 'Beosztva innen: ';
+$labels['savetotasklist'] = 'Save to tasks';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
+$labels['errorimportingtask'] = 'Failed to import task(s)';
+$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
+$labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importerror'] = 'Hiba importálás közben';
+$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
+$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
+$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
+$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
+$labels['attendeupdateesuccess'] = 'A résztvevők adatai sikeresen frissítve';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
+$labels['itipinvalidrequest'] = 'Ez a meghívás már érvénytelen';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'The task has been deleted successfully.';
diff --git a/plugins/tasklist/localization/it_IT.inc b/plugins/tasklist/localization/it_IT.inc
index 3ae7ebfc..fd52f110 100644
--- a/plugins/tasklist/localization/it_IT.inc
+++ b/plugins/tasklist/localization/it_IT.inc
@@ -10,6 +10,9 @@ $labels['navtitle'] = 'Attività';
 $labels['lists'] = 'Elenchi attività';
 $labels['list'] = 'Elenco attività';
 $labels['tags'] = 'Etichette';
+$labels['export'] = 'Esporta';
+$labels['exporttitle'] = 'Esporta come iCalendar';
+$labels['exportattachments'] = 'Con allegati';
 $labels['tasklistsubscribe'] = 'Elenca sempre';
 $labels['listsearchresults'] = 'Elenchi attività disponibili';
 $labels['findlists'] = 'Cerca elenchi attività...';
@@ -43,6 +46,7 @@ $labels['status-cancelled'] = 'Cancellato';
 $labels['assignedto'] = 'Assegnato a';
 $labels['created'] = 'Creato';
 $labels['changed'] = 'Ultima modifica';
+$labels['taskoptions'] = 'Opzioni';
 $labels['all'] = 'Tutto';
 $labels['flagged'] = 'Importanti';
 $labels['complete'] = 'Fatto';
@@ -60,7 +64,6 @@ $labels['nodate'] = 'Senza data';
 $labels['removetag'] = 'Elimina';
 $labels['removelink'] = 'Rimuovi riferimento email';
 $labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Dettagli';
 $labels['newtask'] = 'Nuova attività';
 $labels['edittask'] = 'Modifica attività';
 $labels['save'] = 'Salva';
@@ -88,6 +91,7 @@ $labels['on'] = 'su';
 $labels['at'] = 'a';
 $labels['this'] = 'questo';
 $labels['next'] = 'prossimo';
+$labels['yes'] = 'sì';
 $labels['savingdata'] = 'Salvataggio dati...';
 $labels['errorsaving'] = 'Salvataggio dati fallito.';
 $labels['notasksfound'] = 'Nessuna attività trovata.';
@@ -107,6 +111,7 @@ $labels['arialabelquicksearchbox'] = 'Inserimento ricerca attività';
 $labels['arialabellistsearchform'] = 'Modulo ricerca liste attività';
 $labels['arialabeltaskselector'] = 'Modo lista';
 $labels['arialabeltasklisting'] = 'Lista attività';
+$labels['arialabelsortmenu'] = 'Opzioni ordinamento attività';
 $labels['attendee'] = 'Assegnatario';
 $labels['role'] = 'Ruolo';
 $labels['availability'] = 'Dispon.';
@@ -121,13 +126,14 @@ $labels['sendinvitations'] = 'Manda inviti';
 $labels['sendnotifications'] = 'Informa gli assegnatari delle modifiche';
 $labels['sendcancellation'] = 'Informa gli assegnatari della cancellazione dell\'attività';
 $labels['invitationsubject'] = 'Sei stato assegnato a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nScadenza: \$date\n\nAssegnatari: \$attendees\n\nIn allegato un file iCalendar con tutti i dettagli dell'attività che puoi importare nella tua applicazione di attività.";
 $labels['itipupdatesubject'] = '"$title" è stato aggiornato';
 $labels['itipupdatesubjectempty'] = 'Un\'attività che ti riguarda è stata aggiornata';
 $labels['itipupdatemailbody'] = "*\$title*\n\nScadenza: \$date\n\nAssegnatari: \$attendees\n\nIn allegato un file iCalendar con i dettagli dell'attività aggiornati che puoi importare nella tua applicazione di attività.";
-$labels['itipcancelsubject'] = '"$title" è stato annullato';
 $labels['itipcancelmailbody'] = "*\$title*\n\nScadenza: \$date\n\nAssegnatari: \$attendees\n\nL'attività è stata cancellata da \$organizer.\n\nIn allegato un file iCalendar con i dettagli dell'attività aggiornati ";
 $labels['saveintasklist'] = 'Salva in';
+$labels['taskhistory'] = 'Storico';
+$labels['objectchangelog'] = 'Storico modifiche';
+$labels['objectdiffnotavailable'] = 'Nessun confronto possibile tra le revisioni selezionate';
 $labels['itipobjectnotfound'] = 'L\'attività riportata da questo messaggio non è stata trovata nella tua lista attività.';
 $labels['itipmailbodyaccepted'] = "\$sender ha accettato l'assegnazione alla seguente attività:\n\n*\$title*\n\nScadenza: \$date\n\nAssegnatari: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender ha provvisoriamente accettato l'assegnazione alla seguente attività:\n\n*\$title*\n\nScadenza:\$date\n\nAssegnatari: \$attendees";
@@ -148,13 +154,13 @@ $labels['itipsendsuccess'] = 'Notifica inviata agli assegnatari';
 $labels['errornotifying'] = 'Impossibile inviare notifiche agli assegnatari dell\'attività';
 $labels['removefromcalendar'] = 'Rimuovi dalle mie attività';
 $labels['andnmore'] = 'Altri $nr...';
-$labels['delegatedto'] = 'Delegato a:';
-$labels['delegatedfrom'] = 'Delegato da:';
 $labels['savetotasklist'] = 'Salva su attività';
 $labels['comment'] = 'Commento';
+$labels['rsvpcomment'] = 'Commento';
 $labels['errorimportingtask'] = 'Impossibile importare attività';
 $labels['importwarningexists'] = 'Una copia di questa attività esiste già nella tua lista attività.';
 $labels['importsuccess'] = 'Importate con successo $nr attività';
+$labels['importerror'] = 'Si è verificato un errore durante l\'importazione';
 $labels['newerversionexists'] = 'Una versione più recente di questa attività esiste già! Interrotto.';
 $labels['nowritetasklistfound'] = 'Nessuna lista attività trovata nella quale salvare l\'attività';
 $labels['importedsuccessfully'] = 'L\'attività è stata aggiunta con successo a \'$list\'';
@@ -163,4 +169,3 @@ $labels['attendeupdateesuccess'] = 'Stato dei partecipanti aggiornato correttame
 $labels['itipresponseerror'] = 'Impossibile spedire la risposta a questa assegnazione attività';
 $labels['itipinvalidrequest'] = 'Questo invito non è più valido';
 $labels['successremoval'] = 'L\'attività è stata cancellata con successo.';
-$labels['arialabelsortmenu'] = 'Opzioni ordinamento attività';
diff --git a/plugins/tasklist/localization/ja_JP.inc b/plugins/tasklist/localization/ja_JP.inc
index c96ccaf0..f47b2fcc 100644
--- a/plugins/tasklist/localization/ja_JP.inc
+++ b/plugins/tasklist/localization/ja_JP.inc
@@ -10,9 +10,23 @@ $labels['navtitle'] = 'タスク';
 $labels['lists'] = 'タスク一覧';
 $labels['list'] = 'タスク一覧';
 $labels['tags'] = 'タグ';
+$labels['export'] = 'エクスポート';
+$labels['exporttitle'] = 'iカレンダーへエクスポート';
+$labels['exportattachments'] = '添付する';
+$labels['tasklistsubscribe'] = '持続的なもののリスト';
+$labels['listsearchresults'] = '有効なタスクリスト';
+$labels['findlists'] = 'タスクリストの検索';
+$labels['searchterms'] = '用語検索';
+$labels['notasklistsfound'] = 'タスクリストが見つかりませんでした';
+$labels['nrtasklistsfound'] = '$nr タスクリストは見つかりません';
+$labels['removelist'] = 'リストから削除';
+$labels['showcaldavurl'] = 'CalDAV URL の表示';
+$labels['caldavurldescription'] = 'この指定されたタスクリストをコンピュータやモバイルデバイスと同期させるために <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> クライアントアプリケーションへこのアドレスをコピーしてください(たとえば エボリューションやMozillaサンダーバード)。';
 $labels['newtask'] = '新しいタスク';
+$labels['createtask'] = 'Create Task <Enter>';
 $labels['createnewtask'] = '新しいタスクの生成(例:土曜日、芝生を刈る)';
 $labels['createfrommail'] = 'タスクとして保存';
+$labels['printtitle'] = 'タスク印刷';
 $labels['printdescriptions'] = '説明印刷';
 $labels['mark'] = 'マーク';
 $labels['unmark'] = 'マーク解除';
@@ -20,58 +34,155 @@ $labels['edit'] = '編集';
 $labels['delete'] = '削除';
 $labels['title'] = 'タイトル';
 $labels['description'] = '説明';
+$labels['datetime'] = '期限';
+$labels['duetime'] = '期日';
 $labels['start'] = '開始';
+$labels['starttime'] = '開始時間';
 $labels['alarms'] = '通知';
 $labels['repeat'] = '繰返し';
+$labels['links'] = '参照';
 $labels['status'] = '状態';
+$labels['status-needs-action'] = 'やるべき事';
+$labels['status-in-process'] = '進行中';
+$labels['status-completed'] = '完了';
+$labels['status-cancelled'] = 'キャンセル済';
+$labels['assignedto'] = '割当先';
+$labels['created'] = '作成済';
+$labels['changed'] = '最終変更';
+$labels['taskoptions'] = 'オプション';
 $labels['all'] = '全て';
 $labels['flagged'] = 'フラグ';
 $labels['complete'] = '完了';
+$labels['completeness'] = '進捗';
 $labels['overdue'] = '期限切れ';
 $labels['today'] = '今日';
 $labels['tomorrow'] = '明日';
 $labels['next7days'] = '翌 7 日';
 $labels['later'] = '後で';
+$labels['assigned'] = '割当済';
+$labels['assignedtitle'] = '他へ割当てたタスク';
+$labels['mytasks'] = 'マイ タスク';
+$labels['mytaskstitle'] = '自分に割当てられたタスク';
 $labels['nodate'] = '期日なし';
 $labels['removetag'] = '削除';
-$labels['taskdetails'] = '詳細';
+$labels['removelink'] = 'Eメール引用文の削除';
+$labels['auto'] = '自動';
 $labels['newtask'] = '新しいタスク';
 $labels['edittask'] = 'タスク編集';
 $labels['save'] = '保存';
 $labels['cancel'] = 'キャンセル';
+$labels['saveandnotify'] = '保存と通知';
 $labels['addsubtask'] = 'サブタスク追加';
 $labels['deletetask'] = 'タスク削除';
 $labels['deletethisonly'] = 'このタスクのみ削除';
 $labels['deletewithchilds'] = '全てのサブタスクも削除';
+$labels['taskactions'] = 'タスク オプション...';
 $labels['tabsummary'] = '要約';
 $labels['tabrecurrence'] = '繰返し';
+$labels['tabassignments'] = '割当';
 $labels['tabattachments'] = '添付';
 $labels['tabsharing'] = '共有';
 $labels['editlist'] = '一覧編集';
 $labels['createlist'] = '一覧追加';
 $labels['listactions'] = '一覧オプション';
 $labels['listname'] = '名前';
+$labels['showalarms'] = 'リマインド表示';
 $labels['import'] = 'インポート';
+$labels['viewactions'] = '行動ビュー';
+$labels['focusview'] = 'このリストは閲覧のみ';
 $labels['on'] = '上';
 $labels['at'] = 'の';
 $labels['this'] = 'この';
 $labels['next'] = '次';
+$labels['yes'] = 'はい';
 $labels['savingdata'] = 'データを保存中…';
 $labels['errorsaving'] = 'データが保存できませんでした。';
 $labels['notasksfound'] = '条件に該当するタスクは見つかりません';
 $labels['invalidstartduedates'] = '開始日は終了日の前でなければいけません。';
+$labels['invalidstartduetimes'] = '開始と期日は両方とも時間を指定する、もしくは両方とも指定しないようにしなければいけません。';
+$labels['recurrencerequiresdate'] = '繰返しタスクは開始と期日の両方が必要です。';
 $labels['deletetasktconfirm'] = 'このタスクを本当に削除しますか?';
 $labels['deleteparenttasktconfirm'] = 'このタスクとすべてのサブタスクを本当に削除しますか?';
 $labels['deletelistconfirm'] = '本当に、この一覧とすべてのタスクを一緒に削除しますか?';
+$labels['deletelistconfirmrecursive'] = '本当に全てのサブリストやタスクとともにこのリストを削除しますか?';
+$labels['aclnorights'] = 'このタスクリストの管理権限がありません。';
+$labels['changetaskconfirm'] = 'タスク更新';
+$labels['changeconfirmnotifications'] = 'この変更について出席者へ通知しますか?';
+$labels['partstatupdatenotification'] = 'ステータスの変更についてオーガナイザーへ通知しますか?';
+$labels['quickaddinput'] = '新しいタスク日時とタイトル';
+$labels['arialabelquickaddbox'] = '新しいタスクのクイック追加';
+$labels['arialabelsearchform'] = 'タスク検索元';
+$labels['arialabelquicksearchbox'] = 'タスク検索入力';
+$labels['arialabellistsearchform'] = 'タスクリスト検索元';
+$labels['arialabeltaskselector'] = 'リストモード';
+$labels['arialabeltasklisting'] = 'タスクリスト化';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['attendee'] = '引受者';
 $labels['role'] = 'ロール';
 $labels['availability'] = '利用可';
 $labels['confirmstate'] = '状態';
+$labels['addattendee'] = '引受者追加';
 $labels['roleorganizer'] = '編成者';
 $labels['rolerequired'] = '要件';
 $labels['roleoptional'] = 'オプション';
+$labels['rolechair'] = '議長';
+$labels['rolenonparticipant'] = '傍聴人';
 $labels['sendinvitations'] = '招待を送る';
+$labels['sendnotifications'] = '変更を引受人に通知';
+$labels['sendcancellation'] = 'タスクの中止を引受人へ通知';
+$labels['invitationsubject'] = '"$title" へ割当られました';
 $labels['itipupdatesubject'] = '"$title" はアップデートされました';
-$labels['itipcancelsubject'] = '"$title" は変更されました';
+$labels['itipupdatesubjectempty'] = 'あなたに関連するイベントが更新されました';
+$labels['itipupdatemailbody'] = "*\$title*\n\nいつ: \$date\n\n 引受人: \$attendees\n\n添付されたあなたのタスクアプリケーションにインポート可能なタスク更新の詳細を含むiカレンダーファイルを見つけてください。";
+$labels['itipcancelmailbody'] = "*\$title*\n\nいつ: \$date\n\n引受人: \$attendees\n\nタスクは \$organizer によってキャンセルされました。\n\n添付されたタスク詳細を含むiカレンダーファイルを見つけてください。";
+$labels['saveintasklist'] = '保存';
+$labels['taskhistory'] = '履歴';
+$labels['objectchangelog'] = '変更履歴';
+$labels['objectdiff'] = '$rev1 から $rev2 への変更';
+$labels['objectnotfound'] = 'タスクデータのロードに失敗しました';
+$labels['objectchangelognotavailable'] = 'このタスクの変更履歴は利用できません';
+$labels['objectdiffnotavailable'] = '選択されたリビジョンでは比較できません';
+$labels['revisionrestoreconfirm'] = '本当にリビジョン $rev のタスクを復旧しますか? 現在のタスクは古いバージョンのタスクに置換えられます。';
+$labels['objectrestoresuccess'] = 'リビジョン $rev は復旧されました';
+$labels['objectrestoreerror'] = '古いバージョンの復旧に失敗しました';
+$labels['itipobjectnotfound'] = 'このメッセージによって参照されるタスクはタスクリストには見つかりませんでした。';
+$labels['itipmailbodyaccepted'] = "\$sender は以下のタスクの割当を承諾しました: \n\n*\$title*\n\nいつ: \$date\n\n引受人:  \$attendees";
+$labels['itipmailbodytentative'] = "\$sender は以下のタスクの割当を仮承諾しました: \n\n*\$title*\n\nいつ: \$date\n\n引受人: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender は以下のタスクの割当を辞退しました: \n\n*\$title*\n\nいつ: \$date\n\n引受人: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender は以下のタスクの割当を断りました: :\n\n*\$title*\n\nいつ: \$date";
+$labels['itipmailbodyin-process'] = "\$sender は以下のタスクのステータスを進行中にしました: \n\n*\$title*\n\nいつ: \$date";
+$labels['itipmailbodycompleted'] = "\$sender は以下のタスクを完了しました: \n\n*\$title*\n\nいつ: \$date";
+$labels['itipmailbodydelegated'] = "\$sender は以下のタスクを代理しました: \n\n*\$title*\n\nいつ: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender は以下のタスクをあなたへ代理しました: \n\n*\$title*\n\nいつ: \$date";
+$labels['attendeeaccepted'] = '引受人は承諾しました';
+$labels['attendeetentative'] = '引受人は仮承諾しました';
+$labels['attendeedeclined'] = '引受人は拒否しました';
+$labels['attendeedelegated'] = '引受人は $delegatedto へ代理しました';
+$labels['attendeein-process'] = '引受人は進行中です';
+$labels['attendeecompleted'] = '引受人は完了しました';
+$labels['acceptinvitation'] = 'この割当を承諾しますか?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Notification sent to assignees';
+$labels['errornotifying'] = 'Failed to send notifications to task assignees';
+$labels['removefromcalendar'] = 'Remove from my tasks';
+$labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr さらに…';
+$labels['savetotasklist'] = 'Save to tasks';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'コメント';
+$labels['errorimportingtask'] = 'Failed to import task(s)';
+$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
+$labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importerror'] = 'インポート中にエラーが発生しました。';
+$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
+$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
+$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
+$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
 $labels['attendeupdateesuccess'] = '出席者状況を更新しました';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
 $labels['itipinvalidrequest'] = 'この招待は間もなく無効になります';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'The task has been deleted successfully.';
diff --git a/plugins/tasklist/localization/ko_KR.inc b/plugins/tasklist/localization/ko_KR.inc
new file mode 100644
index 00000000..4a2c5c11
--- /dev/null
+++ b/plugins/tasklist/localization/ko_KR.inc
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['export'] = '내보내기';
+$labels['exporttitle'] = 'iCalendar로 내보내기';
+$labels['exportattachments'] = '첨부됨';
+$labels['removelist'] = '목록에서 삭제';
+$labels['printdescriptions'] = '내용 출력';
+$labels['edit'] = '수정';
+$labels['description'] = '설명';
+$labels['start'] = '시작';
+$labels['starttime'] = '시작 시간';
+$labels['alarms'] = '알림';
+$labels['repeat'] = '반복';
+$labels['links'] = '참조';
+$labels['status'] = '상태';
+$labels['status-cancelled'] = '취소됨';
+$labels['created'] = '작성됨';
+$labels['changed'] = '마지막으로 수정됨';
+$labels['taskoptions'] = '옵션';
+$labels['all'] = '전체';
+$labels['today'] = '오늘';
+$labels['tomorrow'] = '내일';
+$labels['save'] = '저장';
+$labels['cancel'] = '취소';
+$labels['tabsummary'] = '요약';
+$labels['tabrecurrence'] = '반복';
+$labels['listname'] = '이름';
+$labels['showalarms'] = '알림 보이기';
+$labels['savingdata'] = '자료 저장중...';
+$labels['availability'] = '가능';
+$labels['confirmstate'] = '상태';
+$labels['roleorganizer'] = '주최자';
+$labels['rolerequired'] = '필수';
+$labels['roleoptional'] = '선택';
+$labels['rolechair'] = '좌석';
+$labels['sendinvitations'] = '초대장 보내기';
+$labels['taskhistory'] = '이력';
+$labels['objectrestoreerror'] = '이전 버전으로 복구하지 못하였습니다';
+$labels['andnmore'] = '$nr 더...';
+$labels['comment'] = '코멘트';
+$labels['rsvpcomment'] = '코멘트';
+$labels['importerror'] = '가져오는 도중 오류가 발생했습니다';
+$labels['itipinvalidrequest'] = '이 초대장은 더이상 유효하지 않습니다';
diff --git a/plugins/tasklist/localization/lv.inc b/plugins/tasklist/localization/lv.inc
new file mode 100644
index 00000000..eba52923
--- /dev/null
+++ b/plugins/tasklist/localization/lv.inc
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['export'] = 'Eksportēt';
+$labels['exporttitle'] = 'Eksportēt uz iCalendar';
+$labels['exportattachments'] = 'Ar pielikumiem';
+$labels['tasklistsubscribe'] = 'Rādīt sarakstā vienmēr';
+$labels['searchterms'] = 'Meklēšanas nosacījumi';
+$labels['removelist'] = 'Dzēst no saraksta';
+$labels['printdescriptions'] = 'Drukāt aprakstus';
+$labels['edit'] = 'Labot';
+$labels['description'] = 'Apraksts';
+$labels['start'] = 'Sākums';
+$labels['starttime'] = 'Sākums';
+$labels['alarms'] = 'Atgādinājums';
+$labels['repeat'] = 'Atkārtot';
+$labels['links'] = 'Atsauce';
+$labels['status'] = 'Statuss';
+$labels['status-needs-action'] = 'Nepieciešama darbība';
+$labels['status-in-process'] = 'Procesā';
+$labels['status-completed'] = 'Pabeigts';
+$labels['status-cancelled'] = 'Atcelts';
+$labels['created'] = 'Izveidots';
+$labels['changed'] = 'Mainīts';
+$labels['taskoptions'] = 'iespējas';
+$labels['all'] = 'Visi';
+$labels['today'] = 'Šodien';
+$labels['tomorrow'] = 'Rīt';
+$labels['removelink'] = 'Noņemt atsauci uz e-pastu';
+$labels['save'] = 'Saglabāt';
+$labels['cancel'] = 'Atcelt';
+$labels['tabsummary'] = 'Kopsavilkums';
+$labels['tabrecurrence'] = 'Atkārtojums';
+$labels['tabattachments'] = 'Pielikumi';
+$labels['tabsharing'] = 'Dalīšanās';
+$labels['listname'] = 'Nosaukums';
+$labels['showalarms'] = 'Rādīt atgādinājumus';
+$labels['at'] = ' ';
+$labels['yes'] = 'jā';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['role'] = 'Loma';
+$labels['availability'] = 'Pieej.';
+$labels['confirmstate'] = 'Statuss';
+$labels['roleorganizer'] = 'Organizētājs';
+$labels['rolerequired'] = 'Obligāti';
+$labels['roleoptional'] = 'Pēc izvēles';
+$labels['rolechair'] = 'Vadītājs';
+$labels['sendinvitations'] = 'Nosūtīt uzaicinājumus';
+$labels['itipupdatesubject'] = '"$title" ir mainīts';
+$labels['itipcancelsubject'] = '"$title" ir atcelts';
+$labels['taskhistory'] = 'Vēsture';
+$labels['objectchangelog'] = 'Mainīt vēsturi';
+$labels['objectdiff'] = 'Izmaiņas no $rev1 uz $rev2';
+$labels['objectdiffnotavailable'] = 'Izvēlētās versijas nav salīdzināmas';
+$labels['objectrestoresuccess'] = 'Versija $rev veiksmīgi atjaunota';
+$labels['objectrestoreerror'] = 'Kļūda atjaunojot veco versiju';
+$labels['itipcomment'] = 'Uzaicinājumam/paziņojuma komentārs';
+$labels['andnmore'] = 'vēl $nr ...';
+$labels['comment'] = 'Komentārs';
+$labels['rsvpcomment'] = 'Komentārs';
+$labels['importerror'] = 'Kļūda importa laikā';
+$labels['attendeupdateesuccess'] = 'Dalībnieku statusi veiksmīgi atjaunoti';
+$labels['itipinvalidrequest'] = 'Šis uzaicinājums vairs nav spēkā';
diff --git a/plugins/tasklist/localization/nl_NL.inc b/plugins/tasklist/localization/nl_NL.inc
index 0a9c7a98..107e2a80 100644
--- a/plugins/tasklist/localization/nl_NL.inc
+++ b/plugins/tasklist/localization/nl_NL.inc
@@ -9,76 +9,183 @@
 $labels['navtitle'] = 'Taken';
 $labels['lists'] = 'Takenlijsten';
 $labels['list'] = 'Takenlijst';
-$labels['tags'] = 'Labels';
-$labels['tasklistsubscribe'] = 'Permanent weergeven';
-$labels['newtask'] = 'Nieuwe Taak';
-$labels['createnewtask'] = 'Creer een nieuwe Taak (bijv. Zaterdag, gras maaien)';
-$labels['createfrommail'] = 'Als taak opslaan';
+$labels['tags'] = 'Tags';
+$labels['export'] = 'Exporteren';
+$labels['exporttitle'] = 'Exporteren naar iCalendar';
+$labels['exportattachments'] = 'Met bijlagen';
+$labels['currentview'] = 'huidige weergave';
+$labels['tasklistsubscribe'] = 'Definitief weergeven';
+$labels['listsearchresults'] = 'Beschikbare takenlijsten';
+$labels['findlists'] = 'Takenlijsten zoeken...';
+$labels['searchterms'] = 'Zoektermen';
+$labels['notasklistsfound'] = 'Geen takenlijsten gevonden';
+$labels['nrtasklistsfound'] = '$nr takenlijsten gevonden';
+$labels['removelist'] = 'Verwijderen uit lijst';
+$labels['showcaldavurl'] = 'CalDAV-URL tonen';
+$labels['caldavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-client (bijv. Evolution of Mozilla Thunderbird) om deze specifieke takenlijst te synchroniseren met uw computer of mobiele apparaat.';
+$labels['newtask'] = 'Nieuwe taak';
+$labels['createtask'] = 'Taak maken <Enter>';
+$labels['createnewtask'] = 'Nieuwe taak maken (bijv. gras maaien op zaterdag)';
+$labels['createfrommail'] = 'Opslaan als taak';
 $labels['printtitle'] = 'Taken afdrukken';
-$labels['printdescriptions'] = 'Print beschrijvingen';
+$labels['printdescriptions'] = 'Beschrijvingen afdrukken';
 $labels['mark'] = 'Markeren';
-$labels['unmark'] = 'Demarkeren';
-$labels['edit'] = 'Wijzigen';
+$labels['unmark'] = 'Markering opheffen';
+$labels['edit'] = 'Bewerken';
 $labels['delete'] = 'Verwijderen';
-$labels['title'] = 'Titel';
+$labels['title'] = 'Naam';
 $labels['description'] = 'Beschrijving';
 $labels['datetime'] = 'Vóór';
+$labels['duetime'] = 'Vervaltijd';
 $labels['start'] = 'Begin';
+$labels['starttime'] = 'Begintijd';
 $labels['alarms'] = 'Herinnering';
-$labels['repeat'] = 'Herhaal';
-$labels['all'] = 'Alle';
+$labels['repeat'] = 'Herhalen';
+$labels['links'] = 'Referentie';
+$labels['status'] = 'Status';
+$labels['status-needs-action'] = 'Actie vereist';
+$labels['status-in-process'] = 'In behandeling';
+$labels['status-completed'] = 'Voltooid';
+$labels['status-cancelled'] = 'Geannuleerd';
+$labels['assignedto'] = 'Toegewezen aan';
+$labels['created'] = 'Gemaakt op';
+$labels['changed'] = 'Laatst gewijzigd op';
+$labels['taskoptions'] = 'Opties';
+$labels['all'] = 'Alles';
 $labels['flagged'] = 'Gemarkeerd';
-$labels['complete'] = 'Compleet';
-$labels['completeness'] = 'Progress';
+$labels['complete'] = 'Voltooien';
+$labels['completeness'] = 'Voortgang';
 $labels['overdue'] = 'Achterstallig';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
 $labels['next7days'] = 'Volgende 7 dagen';
+$labels['later'] = 'Later';
+$labels['assigned'] = 'Toegewezen';
+$labels['assignedtitle'] = 'Taken die u aan anderen hebt toegewezen';
+$labels['mytasks'] = 'Mijn taken';
+$labels['mytaskstitle'] = 'Taken die aan u zijn toegewezen';
 $labels['nodate'] = 'geen datum';
-$labels['removetag'] = 'Verwijder';
-$labels['newtask'] = 'Nieuwe Taak';
-$labels['edittask'] = 'Taak Wijzigen';
+$labels['removetag'] = 'Verwijderen';
+$labels['removelink'] = 'E-mailreferentie verwijderen';
+$labels['auto'] = 'Automatisch';
+$labels['newtask'] = 'Nieuwe taak';
+$labels['edittask'] = 'Taak bewerken';
 $labels['save'] = 'Opslaan';
 $labels['cancel'] = 'Annuleren';
-$labels['addsubtask'] = 'Voeg subtaak toe';
-$labels['deletetask'] = 'Verwijder taak';
-$labels['deletethisonly'] = 'Verwijder alleen deze taak';
-$labels['deletewithchilds'] = 'Verwijder inclusief subtaken';
+$labels['saveandnotify'] = 'Opslaan en melden';
+$labels['addsubtask'] = 'Subtaak toevoegen';
+$labels['deletetask'] = 'Taak verwijderen';
+$labels['deletethisonly'] = 'Alleen deze taak verwijderen';
+$labels['deletewithchilds'] = 'Verwijderen inclusief subtaken';
+$labels['taskactions'] = 'Taakopties...';
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
-$labels['tabassignments'] = 'Assignments';
-$labels['tabattachments'] = 'Toebehoren';
+$labels['tabassignments'] = 'Toegewezen taken';
+$labels['tabattachments'] = 'Bijlagen';
 $labels['tabsharing'] = 'Delen';
-$labels['editlist'] = 'Lijst wijzigen';
+$labels['editlist'] = 'Lijst bewerken';
 $labels['createlist'] = 'Lijst toevoegen';
-$labels['listactions'] = 'Lijst opties...';
+$labels['listactions'] = 'Lijstopties...';
 $labels['listname'] = 'Naam';
-$labels['showalarms'] = 'Laat herinneringen zien';
+$labels['showalarms'] = 'Herinneringen tonen';
 $labels['import'] = 'Importeren';
-$labels['viewactions'] = 'View actions';
-$labels['focusview'] = 'Bekijk alleen deze lijst';
+$labels['viewactions'] = 'Acties weergeven';
+$labels['focusview'] = 'Alleen deze lijst weergeven';
 $labels['on'] = 'op';
 $labels['at'] = 'om';
 $labels['this'] = 'deze';
 $labels['next'] = 'volgende';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['errorsaving'] = 'Fout in opslaan van data.';
-$labels['notasksfound'] = 'Geen taken gevonden voor de gegeven criteria';
-$labels['invalidstartduedates'] = 'Begin datum kan niet later zijn dan vervaldag.';
-$labels['deletetasktconfirm'] = 'Wilt u deze taak echt verwijderen?';
-$labels['deleteparenttasktconfirm'] = 'Wilt u deze taak en alle subtaken echt verwijderen?';
-$labels['deletelistconfirm'] = 'Wilt u deze lijst met alle taken echt verwijderen?';
-$labels['deletelistconfirmrecursive'] = 'Wilt u deze lijst en alle taken en subtaken echt verwijderen?';
+$labels['yes'] = 'ja';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['errorsaving'] = 'Fout bij opslaan van gegevens.';
+$labels['notasksfound'] = 'Geen taken gevonden voor de opgegeven criteria';
+$labels['invalidstartduedates'] = 'Begindatum kan niet na vervaldatum vallen.';
+$labels['invalidstartduetimes'] = 'Zowel de begindatum als de einddatum moet al dan niet een tijd opgeven.';
+$labels['recurrencerequiresdate'] = 'Herhaalde taken vereisen een begin- of vervaldatum.';
+$labels['deletetasktconfirm'] = 'Weet u zeker dat u deze taak wilt verwijderen?';
+$labels['deleteparenttasktconfirm'] = 'Weet u zeker dat u deze taak en alle subtaken wilt verwijderen?';
+$labels['deletelistconfirm'] = 'Weet u zeker dat u deze lijst met alle taken wilt verwijderen?';
+$labels['deletelistconfirmrecursive'] = 'Weet u zeker dat u deze lijst met alle taken en subtaken wilt verwijderen?';
+$labels['aclnorights'] = 'U hebt geen administratorrechten voor deze takenlijst.';
+$labels['changetaskconfirm'] = 'Taak bijwerken';
+$labels['changeconfirmnotifications'] = 'Wilt u de wijziging melden aan de deelnemers?';
+$labels['partstatupdatenotification'] = 'Wilt u de gewijzigde status melden aan de organisator?';
+$labels['quickaddinput'] = 'Nieuwe datum en naam voor taak';
+$labels['arialabelquickaddbox'] = 'Snel nieuwe taak toevoegen';
+$labels['arialabelsearchform'] = 'Zoekformulier voor taken';
+$labels['arialabelquicksearchbox'] = 'Zoekopdracht voor taken';
+$labels['arialabellistsearchform'] = 'Zoekformulier voor takenlijsten';
+$labels['arialabeltaskselector'] = 'Lijstmodus';
+$labels['arialabeltasklisting'] = 'Taken in lijst weergeven';
+$labels['arialabelsortmenu'] = 'Sorteeropties voor taken';
+$labels['attendee'] = 'Toegewezen persoon';
 $labels['role'] = 'Rol';
-$labels['availability'] = 'Beschikb.';
-$labels['roleorganizer'] = 'Organisatie';
+$labels['availability'] = 'Beschikbaar';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Toegewezen persoon toevoegen';
+$labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Verplicht';
 $labels['roleoptional'] = 'Optioneel';
 $labels['rolechair'] = 'Voorzitter';
-$labels['sendinvitations'] = 'Verzend uitnodigingen';
-$labels['itipupdatesubject'] = '"$title" is gewijzigd';
+$labels['rolenonparticipant'] = 'Waarnemer';
+$labels['sendinvitations'] = 'Uitnodigingen versturen';
+$labels['sendnotifications'] = 'Wijzigingen melden aan toegewezen personen';
+$labels['sendcancellation'] = 'Annulering van activiteiten melden aan toegewezen personen';
+$labels['invitationsubject'] = '"$title" is toegewezen aan u';
+$labels['itipupdatesubject'] = '"$title" is bijgewerkt';
+$labels['itipupdatesubjectempty'] = 'Een taak die u aangaat is bijgewerkt';
+$labels['itipupdatemailbody'] = "*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de taak die u in uw programma voor taakbeheer kunt importeren.";
 $labels['itipcancelsubject'] = '"$title" is geannuleerd';
-$labels['andnmore'] = '$nr meer...';
-$labels['delegatedto'] = 'Gedelegeerd aan';
-$labels['delegatedfrom'] = 'Gedelegeerd door';
+$labels['itipcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nToegewezen personen: \$attendees\n\nDe taak is geannuleerd door \$organizer.\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de taak.";
+$labels['saveintasklist'] = 'opslaan in ';
+$labels['taskhistory'] = 'Geschiedenis';
+$labels['objectchangelog'] = 'Geschiedenis wijzigen';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
+$labels['objectnotfound'] = 'Laden van taakgegevens is mislukt';
+$labels['objectchangelognotavailable'] = 'Voor deze taak kunt u de geschiedenis niet wijzigen';
+$labels['objectdiffnotavailable'] = 'Geen vergelijking mogelijk voor de geselecteerde revisies';
+$labels['revisionrestoreconfirm'] = 'Weet u zeker dat u revisie $rev van deze taak wilt herstellen? Met deze actie vervangt u de huidige taak door de oude versie.';
+$labels['objectrestoresuccess'] = 'Revisie $rev met succes hersteld';
+$labels['objectrestoreerror'] = 'Herstellen van oude revisie is mislukt';
+$labels['itipobjectnotfound'] = 'De taak uit dit bericht is niet in uw takenlijst gevonden.';
+$labels['itipmailbodyaccepted'] = "\$sender heeft de volgende toegewezen taak geaccepteerd:\n\n*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender heeft de volgende toegewezen taak onder voorbehoud geaccepteerd:\n\n*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender heeft de volgende toegewezen taak afgewezen:\n\n*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender heeft de door u toegewezen taak geweigerd:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodyin-process'] = "\$sender heeft de status van de volgende taak ingesteld op ‘In behandeling’:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodycompleted'] = "\$sender heeft de volgende taak voltooid:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodydelegated'] = "\$sender heeft de volgende taak gedelegeerd:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender heeft de volgende taak gedelegeerd aan u:\n\n*\$title*\n\nEinde: \$date";
+$labels['attendeeaccepted'] = 'Toegewezen persoon heeft geaccepteerd';
+$labels['attendeetentative'] = 'Toegewezen persoon heeft onder voorbehoud geaccepteerd';
+$labels['attendeedeclined'] = 'Toegewezen persoon heeft afgeslagen';
+$labels['attendeedelegated'] = 'Toegewezen persoon heeft gedelegeerd aan $delegatedto';
+$labels['attendeein-process'] = 'De toegewezen persoon heeft de status gewijzigd in ‘In behandeling';
+$labels['attendeecompleted'] = 'De toegewezen persoon heeft de status gewijzigd in ‘Voltooid’';
+$labels['acceptinvitation'] = 'Accepteert u deze toegewezen taak?';
+$labels['itipdeclinetask'] = 'Toegewezen taak afslaan en organisator verwittigen';
+$labels['declinedeleteconfirm'] = 'Wilt u deze afgeslagen taak ook verwijderen uit uw takenlijst?';
+$labels['itipcomment'] = 'Opmerking bij uitnodiging/melding';
+$labels['itipcommenttitle'] = 'Deze opmerking wordt toegevoegd aan de uitnodiging/melding die naar de toegewezen personen wordt verstuurd';
+$labels['itipsendsuccess'] = 'Melding is naar toegewezen personen verstuurd';
+$labels['errornotifying'] = 'Versturen van meldingen naar toegewezen personen van taak is mislukt';
+$labels['removefromcalendar'] = 'Verwijderen uit mijn taken';
+$labels['delegateinvitation'] = 'Toegewezen taak delegeren';
+$labels['andnmore'] = 'Nog $nr..';
+$labels['savetotasklist'] = 'Opslaan in taken';
 $labels['comment'] = 'Opmerking';
+$labels['rsvpcomment'] = 'Opmerking';
+$labels['errorimportingtask'] = 'Importeren van taken is mislukt';
+$labels['importwarningexists'] = 'Een exemplaar van deze taak staat al in uw takenlijst.';
+$labels['importsuccess'] = '$nr taken met succes geïmporteerd';
+$labels['importerror'] = 'Er is een fout tijdens het importeren opgetreden';
+$labels['newerversionexists'] = 'Er bestaat al een nieuwere versie van deze taak! Bewerking afgebroken.';
+$labels['nowritetasklistfound'] = 'Geen takenlijst gevonden om de taak op te slaan';
+$labels['importedsuccessfully'] = 'De taak is met succes toegevoegd aan \'$list\'';
+$labels['updatedsuccessfully'] = 'De taak is met succes bijgewerkt in \'$list\'';
+$labels['attendeupdateesuccess'] = 'Status van deelnemer met succes bijgewerkt';
+$labels['itipresponseerror'] = 'Versturen van antwoord op deze toegewezen taak is mislukt';
+$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet meer geldig';
+$labels['sentresponseto'] = 'Antwoord op toegewezen taak is met succes verstuurd naar $mailto';
+$labels['successremoval'] = 'De taak is met succes verwijderd.';
+$labels['invalidlistproperties'] = 'Ongeldige eigenschappen van lijst! Stel een geldige naam in.';
diff --git a/plugins/tasklist/localization/pl_PL.inc b/plugins/tasklist/localization/pl_PL.inc
index fe68d481..2e0bf072 100644
--- a/plugins/tasklist/localization/pl_PL.inc
+++ b/plugins/tasklist/localization/pl_PL.inc
@@ -10,23 +10,34 @@ $labels['navtitle'] = 'Zadania';
 $labels['lists'] = 'Lista zadań';
 $labels['list'] = 'Lista zadań';
 $labels['tags'] = 'Tagi';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksport w formacie iCalendar';
+$labels['exportattachments'] = 'Z załącznikami';
+$labels['tasklistsubscribe'] = 'Dodaj do listy na stałe';
 $labels['listsearchresults'] = 'Dostępne listy zadań';
 $labels['findlists'] = 'Szukaj list zadań...';
+$labels['searchterms'] = 'Szukana fraza';
 $labels['notasklistsfound'] = 'Nie znaleziono list zadań';
 $labels['removelist'] = 'Usuń z listy';
 $labels['newtask'] = 'Nowe zadanie';
 $labels['createtask'] = 'Utwórz zadanie <Enter>';
 $labels['createnewtask'] = 'Utwórz nowe zadanie (np sobota, zrobić zakupy)';
 $labels['createfrommail'] = 'Zapisz jako zadanie';
+$labels['printdescriptions'] = 'Drukuj opisy';
 $labels['edit'] = 'Edytuj';
 $labels['delete'] = 'Usuń';
 $labels['title'] = 'Tytuł';
 $labels['description'] = 'Opis';
 $labels['start'] = 'Start';
+$labels['starttime'] = 'Początek';
+$labels['alarms'] = 'Przypomnienie';
 $labels['repeat'] = 'Powtórz';
+$labels['links'] = 'Reference';
+$labels['status'] = 'Status';
 $labels['status-cancelled'] = 'Anulowane';
 $labels['created'] = 'Utworzone';
 $labels['changed'] = 'Ostatnia modyfikacja';
+$labels['taskoptions'] = 'Opcje';
 $labels['all'] = 'Wszystko';
 $labels['today'] = 'Dzisiaj';
 $labels['tomorrow'] = 'Jutro';
@@ -37,8 +48,8 @@ $labels['mytasks'] = 'Moje zadania';
 $labels['mytaskstitle'] = 'Zadania przypisane do Ciebie';
 $labels['nodate'] = 'brak daty';
 $labels['removetag'] = 'Usuń';
+$labels['removelink'] = 'Usuń odnośnik e-mail';
 $labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Szczegóły';
 $labels['newtask'] = 'Nowe zadanie';
 $labels['edittask'] = 'Edytuj zadanie';
 $labels['save'] = 'Zapisz';
@@ -49,10 +60,36 @@ $labels['deletethisonly'] = 'Usuń tylko to zadanie';
 $labels['deletewithchilds'] = 'Usuń wraz z podzadaniami';
 $labels['taskactions'] = 'Opcje zadania';
 $labels['tabsummary'] = 'Podsumowanie';
+$labels['tabrecurrence'] = 'Powtarzalność';
+$labels['tabattachments'] = 'Załączniki';
+$labels['tabsharing'] = 'Udostępnianie';
 $labels['editlist'] = 'Edytuj listę';
 $labels['createlist'] = 'Dodaj listę';
 $labels['listactions'] = 'Opcje listy...';
 $labels['listname'] = 'Nazwa';
+$labels['showalarms'] = 'Pokaż powiadomienia';
 $labels['import'] = 'Importuj';
+$labels['savingdata'] = 'Zapisuję dane...';
+$labels['role'] = 'Rola';
+$labels['availability'] = 'Dostępny';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organizator';
 $labels['rolerequired'] = 'Wymagane';
+$labels['roleoptional'] = 'Opcjonalny';
+$labels['rolechair'] = 'Przewodniczący';
+$labels['sendinvitations'] = 'Wyślij zaproszenia';
+$labels['itipupdatesubject'] = '"$title" zostało zaktualizowane';
+$labels['itipcancelsubject'] = '"$title" zostało anulowane';
+$labels['taskhistory'] = 'Historia';
+$labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
+$labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
+$labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
 $labels['andnmore'] = '$nr więcej...';
+$labels['comment'] = 'Komentarz';
+$labels['rsvpcomment'] = 'Komentarz';
+$labels['importerror'] = 'Wystąpił błąd podczas importu.';
+$labels['attendeupdateesuccess'] = 'Zaktualizowano status uczestnika.';
+$labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne.';
diff --git a/plugins/tasklist/localization/pt_BR.inc b/plugins/tasklist/localization/pt_BR.inc
index 4699f090..349217bb 100644
--- a/plugins/tasklist/localization/pt_BR.inc
+++ b/plugins/tasklist/localization/pt_BR.inc
@@ -10,78 +10,135 @@ $labels['navtitle'] = 'Tarefas';
 $labels['lists'] = 'Listas de tarefas';
 $labels['list'] = 'Lista de tarefas';
 $labels['tags'] = 'Etiquetas';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar para iCalendar';
+$labels['exportattachments'] = 'Com anexos';
+$labels['currentview'] = 'visão atual';
 $labels['tasklistsubscribe'] = 'Listar permanentemente';
+$labels['listsearchresults'] = 'Listas de tarefas disponíveis';
+$labels['findlists'] = 'Encontrar listas de tarefas...';
+$labels['searchterms'] = 'Encontrar termos';
+$labels['notasklistsfound'] = 'Listas de tarefas não encontradas';
+$labels['nrtasklistsfound'] = '$nr listas de tarefas encontradas';
+$labels['removelist'] = 'Remover da lista';
+$labels['showcaldavurl'] = 'Mostrar URL de CalDAV';
+$labels['caldavurldescription'] = 'Copie este endereço para uma aplicação <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> cliente (ex.: Evolution ou Mozilla Thunderbird) para sincronizar esta lista de tarefas específica com o seu computador ou dispositivo móvel.';
 $labels['newtask'] = 'Nova Tarefa';
+$labels['createtask'] = 'Criar Tarefa <Enter>';
 $labels['createnewtask'] = 'Criar nova Tarefa (ex.: Sábado, Cortar a grama)';
 $labels['createfrommail'] = 'Salvar como tarefa';
-$labels['printdescriptions'] = 'Descrições de impressão';
+$labels['printtitle'] = 'Imprimir tarefas';
+$labels['printdescriptions'] = 'Imprimir descrições';
 $labels['mark'] = 'Marcar';
 $labels['unmark'] = 'Desmarcar';
 $labels['edit'] = 'Editar';
-$labels['delete'] = 'Deletar';
+$labels['delete'] = 'Excluir';
 $labels['title'] = 'Título';
 $labels['description'] = 'Descrição';
+$labels['datetime'] = 'Vencimento';
+$labels['duetime'] = 'Hora de vencimento';
 $labels['start'] = 'Início';
+$labels['starttime'] = 'Hora de início';
 $labels['alarms'] = 'Lembrete';
 $labels['repeat'] = 'Repetir';
-$labels['links'] = 'Reference';
+$labels['links'] = 'Referência';
 $labels['status'] = 'Situação';
+$labels['status-needs-action'] = 'Precisa ação';
+$labels['status-in-process'] = 'Em progresso';
+$labels['status-completed'] = 'Completo';
+$labels['status-cancelled'] = 'Cancelado';
+$labels['assignedto'] = 'Atribuído à';
+$labels['created'] = 'Criado';
+$labels['changed'] = 'Última modificação';
+$labels['taskoptions'] = 'Opções';
 $labels['all'] = 'Todos';
 $labels['flagged'] = 'Marcado';
-$labels['complete'] = 'Completado';
-$labels['completeness'] = 'Progress';
+$labels['complete'] = 'Completo';
+$labels['completeness'] = 'Progresso';
 $labels['overdue'] = 'Atrasado';
 $labels['today'] = 'Hoje';
 $labels['tomorrow'] = 'Amanhã';
 $labels['next7days'] = 'Próximos 7 dias';
 $labels['later'] = 'Mais tarde';
+$labels['assigned'] = 'Atribuído';
+$labels['assignedtitle'] = 'Tarefas que você designou para outros';
+$labels['mytasks'] = 'Minhas tarefas';
+$labels['mytaskstitle'] = 'Tarefas designadas para você';
 $labels['nodate'] = 'sem data';
 $labels['removetag'] = 'Remover';
-$labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Detalhes';
+$labels['removelink'] = 'Remover referência do email';
+$labels['auto'] = 'Automático';
 $labels['newtask'] = 'Nova Tarefa';
 $labels['edittask'] = 'Editar Tarefa';
 $labels['save'] = 'Gravar';
 $labels['cancel'] = 'Cancelar';
-$labels['saveandnotify'] = 'Save and Notify';
+$labels['saveandnotify'] = 'Salvar e Notificar';
 $labels['addsubtask'] = 'Adicionar subtarefa';
 $labels['deletetask'] = 'Remover tarefa';
-$labels['deletethisonly'] = 'Remover esta tarefa somente';
+$labels['deletethisonly'] = 'Excluir somente esta tarefa';
 $labels['deletewithchilds'] = 'Remover com todas as subtarefas';
-$labels['taskactions'] = 'Task options...';
-$labels['tabsummary'] = 'Sumário';
-$labels['tabrecurrence'] = 'Repetição';
-$labels['tabassignments'] = 'Assignments';
+$labels['taskactions'] = 'Opções de tarefas...';
+$labels['tabsummary'] = 'Resumo';
+$labels['tabrecurrence'] = 'Recorrência';
+$labels['tabassignments'] = 'Atribuições';
 $labels['tabattachments'] = 'Anexos';
 $labels['tabsharing'] = 'Compartilhamento';
 $labels['editlist'] = 'Editar lista';
 $labels['createlist'] = 'Adicionar lista';
 $labels['listactions'] = 'Opções da lista...';
 $labels['listname'] = 'Nome';
+$labels['showalarms'] = 'Mostrar lembrentes';
 $labels['import'] = 'Importar';
+$labels['viewactions'] = 'Ver ações';
+$labels['focusview'] = 'Ver somente esta lista';
 $labels['on'] = 'em';
 $labels['at'] = 'no';
 $labels['this'] = 'este';
 $labels['next'] = 'próximo';
+$labels['yes'] = 'sim';
 $labels['savingdata'] = 'Salvando dados...';
 $labels['errorsaving'] = 'Falha ao salvar dados.';
 $labels['notasksfound'] = 'Nenhuma tarefa encontrada com estes critérios';
 $labels['invalidstartduedates'] = 'Data de início não deve ser maior que data de término.';
-$labels['deletetasktconfirm'] = 'Você realmente quer remover esta tarefa?';
-$labels['deleteparenttasktconfirm'] = 'Você realmente quer remover esta tarefa e todas suas subtarefas?';
-$labels['deletelistconfirm'] = 'Você realmente quer remover esta lista com todas as suas tarefas?';
-$labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
+$labels['invalidstartduetimes'] = 'Ambas as datas de início e término devem ser especificadas ou não com um horário.
+';
+$labels['recurrencerequiresdate'] = 'Tarefas recursivas requerem ou uma data de início ou de término.';
+$labels['deletetasktconfirm'] = 'Você realmente quer excluir esta tarefa?';
+$labels['deleteparenttasktconfirm'] = 'Você realmente quer excluir esta tarefa e todas suas subtarefas?';
+$labels['deletelistconfirm'] = 'Você realmente quer excluir esta lista com todas as suas tarefas?';
+$labels['deletelistconfirmrecursive'] = 'Você realmente quer excluir esta lista com todas suas sublistas e tarefas?';
+$labels['aclnorights'] = 'Você não tem permissões de administrador nesta lista de tareas.';
+$labels['changetaskconfirm'] = 'Atualizar tarefa';
+$labels['changeconfirmnotifications'] = 'Você deseja notificar os participantes sobre essa modificação?';
+$labels['partstatupdatenotification'] = 'Você deseja notificar o organizador sobre a mudança de status?';
+$labels['quickaddinput'] = 'Nova data e título da tarefa';
+$labels['arialabelquickaddbox'] = 'Adicionar rapidamente nova tarefa';
+$labels['arialabelsearchform'] = 'Formulário de busca de tarefa';
+$labels['arialabelquicksearchbox'] = 'Entrada de busca de tarefa';
+$labels['arialabellistsearchform'] = 'Formulário de busca de listas de tarefas';
+$labels['arialabeltaskselector'] = 'Modo lista';
+$labels['arialabeltasklisting'] = 'Listagem de tarefas';
+$labels['attendee'] = 'Designar';
 $labels['role'] = 'Papel';
 $labels['availability'] = 'Disp.';
 $labels['confirmstate'] = 'Situação';
-$labels['addattendee'] = 'Add assignee';
+$labels['addattendee'] = 'Adicionar designação';
 $labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Obrigatório';
 $labels['roleoptional'] = 'Opcional';
+$labels['rolechair'] = 'Cadeira';
+$labels['rolenonparticipant'] = 'Observador';
 $labels['sendinvitations'] = 'Enviar convites';
+$labels['sendnotifications'] = 'Notificar designados sobre as modificações';
+$labels['sendcancellation'] = 'Notificar designados sobre tarefa cancelada';
+$labels['invitationsubject'] = 'Você foi designado para "$title"';
 $labels['itipupdatesubject'] = '"$title" foi atualizado';
-$labels['itipcancelsubject'] = '"$title" foi cancelado';
-$labels['andnmore'] = '$nr mais...';
-$labels['delegatedto'] = 'Delegado para:';
-$labels['delegatedfrom'] = 'Delegado de:';
+$labels['itipupdatesubjectempty'] = 'Uma tarefa de sua atenção foi atualizada';
+$labels['saveintasklist'] = 'salvar em';
+$labels['taskhistory'] = 'Histórico';
+$labels['objectchangelog'] = 'Mudar Histórico';
 $labels['comment'] = 'Comentário';
+$labels['rsvpcomment'] = 'Comentário';
+$labels['importerror'] = 'Ocorreu um erro na importação';
+$labels['attendeupdateesuccess'] = 'O status do participante foi atualizado com sucesso.';
+$labels['itipinvalidrequest'] = 'Este convite não é mais válido';
diff --git a/plugins/tasklist/localization/pt_PT.inc b/plugins/tasklist/localization/pt_PT.inc
index b3d9d152..643eaf93 100644
--- a/plugins/tasklist/localization/pt_PT.inc
+++ b/plugins/tasklist/localization/pt_PT.inc
@@ -6,6 +6,10 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
+$labels['navtitle'] = 'Tarefas';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar para iCalendar';
+$labels['exportattachments'] = 'Incluir anexos';
 $labels['tasklistsubscribe'] = 'Listar permanentemente';
 $labels['searchterms'] = 'Search terms';
 $labels['removelist'] = 'Remove from list';
@@ -21,11 +25,11 @@ $labels['status'] = 'Situação';
 $labels['status-cancelled'] = 'Cancalado';
 $labels['created'] = 'Created';
 $labels['changed'] = 'Last Modified';
+$labels['taskoptions'] = 'Opções';
 $labels['all'] = 'Todos';
 $labels['today'] = 'Hoje';
 $labels['tomorrow'] = 'Amanhã';
 $labels['removelink'] = 'Remove email reference';
-$labels['taskdetails'] = 'Detalhes';
 $labels['save'] = 'Gravar';
 $labels['cancel'] = 'Cancelar';
 $labels['tabsummary'] = 'Sumário';
@@ -45,10 +49,16 @@ $labels['rolechair'] = 'Chair';
 $labels['sendinvitations'] = 'Enviar convites';
 $labels['itipupdatesubject'] = '"$title" foi atualizado';
 $labels['itipcancelsubject'] = '"$title" foi cancelado';
+$labels['taskhistory'] = 'Histórico';
+$labels['objectchangelog'] = 'Alterar histórico';
+$labels['objectdiff'] = 'Diferenças entre $rev1 e $rev2';
+$labels['objectdiffnotavailable'] = 'Não é possível comparar as revisões selecionadas';
+$labels['objectrestoresuccess'] = 'A versão $rev foi reposta com sucesso.';
+$labels['objectrestoreerror'] = 'Não foi possível repor a versão anterior.';
 $labels['itipcomment'] = 'Invitation/notification comment';
 $labels['andnmore'] = '$nr mais...';
-$labels['delegatedto'] = 'Delegado para:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['comment'] = 'Comentário';
+$labels['rsvpcomment'] = 'Comentário';
+$labels['importerror'] = 'Ocorreu um erro na importação';
 $labels['attendeupdateesuccess'] = 'O status do participante foi atualizado com sucesso.';
 $labels['itipinvalidrequest'] = 'Este convite não é mais válido';
diff --git a/plugins/tasklist/localization/ru_RU.inc b/plugins/tasklist/localization/ru_RU.inc
index e4c56aff..74b27597 100644
--- a/plugins/tasklist/localization/ru_RU.inc
+++ b/plugins/tasklist/localization/ru_RU.inc
@@ -10,6 +10,10 @@ $labels['navtitle'] = 'Задачи';
 $labels['lists'] = 'Списки задач';
 $labels['list'] = 'Список задач';
 $labels['tags'] = 'Теги';
+$labels['export'] = 'Экспорт';
+$labels['exporttitle'] = 'Экспорт в iCalendar';
+$labels['exportattachments'] = 'С вложениями';
+$labels['currentview'] = 'текущее представление';
 $labels['tasklistsubscribe'] = 'Всегда показывать';
 $labels['listsearchresults'] = 'Доступные списки задач';
 $labels['findlists'] = 'Найти списки задач...';
@@ -46,6 +50,7 @@ $labels['status-cancelled'] = 'Отмененные';
 $labels['assignedto'] = 'Назначена';
 $labels['created'] = 'Создана';
 $labels['changed'] = 'Изменена';
+$labels['taskoptions'] = 'Опции';
 $labels['all'] = 'Все';
 $labels['flagged'] = 'Отмеченные';
 $labels['complete'] = 'Завершенные';
@@ -63,7 +68,6 @@ $labels['nodate'] = 'без даты';
 $labels['removetag'] = 'Убрать';
 $labels['removelink'] = 'Удалить ссылку на письмо';
 $labels['auto'] = 'Авто';
-$labels['taskdetails'] = 'Подробнее';
 $labels['newtask'] = 'Новая задача';
 $labels['edittask'] = 'Редактировать задачу';
 $labels['save'] = 'Сохранить';
@@ -91,10 +95,12 @@ $labels['on'] = 'в';
 $labels['at'] = 'в';
 $labels['this'] = 'этот';
 $labels['next'] = 'следующий';
+$labels['yes'] = 'да';
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['errorsaving'] = 'Не удалось сохранить.';
 $labels['notasksfound'] = 'По заданному условию не найдено задач';
 $labels['invalidstartduedates'] = 'Начальная дата не может превышать конечную.';
+$labels['invalidstartduetimes'] = 'Для обоих параметров: "дата начала" и "дата окончания" должно быть указано или не указано время.';
 $labels['recurrencerequiresdate'] = 'Повторяющиеся задачи требуют даты начала или завершения.';
 $labels['deletetasktconfirm'] = 'Вы действительно хотите удалить эту задачу?';
 $labels['deleteparenttasktconfirm'] = 'Вы действительно хотите удалить эту задачу и все ее подзадачи?';
@@ -111,6 +117,7 @@ $labels['arialabelquicksearchbox'] = 'Поиск задач';
 $labels['arialabellistsearchform'] = 'Форма поиска списка задач';
 $labels['arialabeltaskselector'] = 'Списком';
 $labels['arialabeltasklisting'] = 'Список задач';
+$labels['arialabelsortmenu'] = 'Настройки сортировки списка задач';
 $labels['attendee'] = 'Ответственный';
 $labels['role'] = 'Роль';
 $labels['availability'] = 'Доступность';
@@ -125,13 +132,21 @@ $labels['sendinvitations'] = 'Отправить приглашения';
 $labels['sendnotifications'] = 'Оповестить ответственных о изменениях';
 $labels['sendcancellation'] = 'Оповестить ответственных об отмене задачи';
 $labels['invitationsubject'] = 'Вас назначили ответственным за "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми задачами которое Вы можете импортировать в вашу программу задач.";
 $labels['itipupdatesubject'] = '"$title" было обновлено';
 $labels['itipupdatesubjectempty'] = 'Задача, касающаяся вас, была обновлена';
 $labels['itipupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми деталями задач которое Вы можете импортировать в вашу программу задач.";
-$labels['itipcancelsubject'] = '"$title" было отменено';
+$labels['itipcancelsubject'] = '"$title" была отменена';
 $labels['itipcancelmailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\nЭто событие отменено \$organizer.\n\nПожалуйста посмотрите вложение в iCalendar файл которое обновит детали задачи.";
 $labels['saveintasklist'] = 'сохранить в ';
+$labels['taskhistory'] = 'История';
+$labels['objectchangelog'] = 'История изменений';
+$labels['objectdiff'] = 'Изменения с $rev1 до $rev2';
+$labels['objectnotfound'] = 'Не удалось загрузить данные задачи';
+$labels['objectchangelognotavailable'] = 'История изменений для этой задачи недоступна';
+$labels['objectdiffnotavailable'] = 'Невозможно провести сравнение выбранных ревизий ';
+$labels['revisionrestoreconfirm'] = 'Вы уверенны, что хотите восстановить этоу задачу из ревизии $rev? Она заменит текущую задачу старой версией. ';
+$labels['objectrestoresuccess'] = 'Ревизия $rev успешно восстановлена';
+$labels['objectrestoreerror'] = 'Не удалось восстановить старую ревизию';
 $labels['itipobjectnotfound'] = 'Задача, упомянутая в этом сообщении, не найдена в вашем списке задач.';
 $labels['itipmailbodyaccepted'] = "\$sender принял назначение ответственным за задание:\n\n*\$title*\n\nВыполнить до: \$date\n\nОтветственные: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender предварительно принял назначение ответственным за задание:\n\n*\$title*\n\nВыполнить до: \$date\n\nОтветственные: \$attendees";
@@ -157,13 +172,13 @@ $labels['errornotifying'] = 'Не удалось отправить оповещ
 $labels['removefromcalendar'] = 'Удалить из моих задач';
 $labels['delegateinvitation'] = 'Назначение представителей';
 $labels['andnmore'] = '$nr больше...';
-$labels['delegatedto'] = 'Поручено:';
-$labels['delegatedfrom'] = 'Поручено от:';
 $labels['savetotasklist'] = 'Сохранить в задачи';
 $labels['comment'] = 'Комментарий';
+$labels['rsvpcomment'] = 'Комментарий';
 $labels['errorimportingtask'] = 'Не удалось импортировать задачи';
 $labels['importwarningexists'] = 'Копия этой задачи уже есть в вашем списке задач.';
 $labels['importsuccess'] = 'Успешно импортированы $nr задач';
+$labels['importerror'] = 'Ошибка при импорте';
 $labels['newerversionexists'] = 'Новая версия этой задачи уже существует! Отменено.';
 $labels['nowritetasklistfound'] = 'Не найден список задач для сохранения этой задачи';
 $labels['importedsuccessfully'] = 'Задача успешно добавлена в \'$list\'';
@@ -173,4 +188,4 @@ $labels['itipresponseerror'] = 'Не удалось отправить отве
 $labels['itipinvalidrequest'] = 'Это приглашение больше не действительно';
 $labels['sentresponseto'] = 'Успешно отправлен ответ на задачу $mailto';
 $labels['successremoval'] = 'Задача успешно удалена.';
-$labels['arialabelsortmenu'] = 'Настройки сортировки списка задач';
+$labels['invalidlistproperties'] = 'Неверные параметры списка! Пожалуйста, задайте действительное имя.';
diff --git a/plugins/tasklist/localization/sk_SK.inc b/plugins/tasklist/localization/sk_SK.inc
index 28b118b3..cad3a2eb 100644
--- a/plugins/tasklist/localization/sk_SK.inc
+++ b/plugins/tasklist/localization/sk_SK.inc
@@ -6,6 +6,9 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
+$labels['export'] = 'Exportovať';
+$labels['exporttitle'] = 'Exportovať do iCalendar';
+$labels['exportattachments'] = 'S prílohami';
 $labels['removelist'] = 'Odstrániť zo zoznamu';
 $labels['edit'] = 'Upraviť';
 $labels['description'] = 'Popis';
diff --git a/plugins/tasklist/localization/sl_SI.inc b/plugins/tasklist/localization/sl_SI.inc
index e7001478..c4247f7b 100644
--- a/plugins/tasklist/localization/sl_SI.inc
+++ b/plugins/tasklist/localization/sl_SI.inc
@@ -10,6 +10,9 @@ $labels['navtitle'] = 'Naloge';
 $labels['lists'] = 'Seznami nalog';
 $labels['list'] = 'Seznam nalog';
 $labels['tags'] = 'Tagi';
+$labels['export'] = 'Izvozi';
+$labels['exporttitle'] = 'Izvozi v iCalendar';
+$labels['exportattachments'] = 'S priponkami';
 $labels['tasklistsubscribe'] = 'Označi za vedno';
 $labels['listsearchresults'] = 'Seznami nalog na voljo';
 $labels['findlists'] = 'Poišči sezname nalog...';
@@ -43,6 +46,7 @@ $labels['status-cancelled'] = 'Preklicano';
 $labels['assignedto'] = 'Dodeljeno osebi';
 $labels['created'] = 'Ustvarjeno';
 $labels['changed'] = 'Nazadnje urejeno';
+$labels['taskoptions'] = 'Nastavitve';
 $labels['all'] = 'Vsi';
 $labels['flagged'] = 'Označeno z zastavico';
 $labels['complete'] = 'Opravi';
@@ -60,7 +64,6 @@ $labels['nodate'] = 'brez datuma';
 $labels['removetag'] = 'Odstrani';
 $labels['removelink'] = 'Odstrani email povezavo';
 $labels['auto'] = 'Auto';
-$labels['taskdetails'] = 'Podrobnosti';
 $labels['newtask'] = 'Nova naloga';
 $labels['edittask'] = 'Uredi nalogo';
 $labels['save'] = 'Shrani';
@@ -107,6 +110,7 @@ $labels['arialabelquicksearchbox'] = 'Vnos iskanja po nalogah';
 $labels['arialabellistsearchform'] = 'Obrazec za iskanje po seznamih';
 $labels['arialabeltaskselector'] = 'Način seznama';
 $labels['arialabeltasklisting'] = 'Prikaz seznamov nalog';
+$labels['arialabelsortmenu'] = 'Nastavitve za sortiranje';
 $labels['attendee'] = 'Dodeljeno osebi';
 $labels['role'] = 'Vloga';
 $labels['availability'] = 'Razpol.';
@@ -121,13 +125,14 @@ $labels['sendinvitations'] = 'Pošlji vabila';
 $labels['sendnotifications'] = 'Pošlji dodanim osebam obvestila o spremembah';
 $labels['sendcancellation'] = 'Pošlji dodanim osebam obvestila o preklicu naloge';
 $labels['invitationsubject'] = 'Dodani ste bili nalogi "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nPoteče: \$date\n\nAssignees: \$attendees\n\nProsim preglejte iCalendar datoteko v priponki z vsemi podrobnostmi naloge. Datoteko lahko uvozite v vašo aplikacijo.";
 $labels['itipupdatesubject'] = '"$title" je bil posodobljen';
 $labels['itipupdatesubjectempty'] = 'Zadevna naloga je bila posodobljena';
 $labels['itipupdatemailbody'] = "*\$title*\n\nPoteče: \$date\n\nAssignees: \$attendees\n\nProsim preglejte iCalendar datoteko v priponki z vsemi podrobnostmi glede naloge. Datoteko lahko uvozite v vašo aplikacijo.";
-$labels['itipcancelsubject'] = '"$title" je bil preklican';
 $labels['itipcancelmailbody'] = "*\$title*\n\nPoteče: \$date\n\nAssignees: \$attendees\n\nNaloga je bila preklicana s strani \$organizer.\n\nProsim preglejte iCalendar datoteko z posodobljenimi podrobnostmi naloge.";
 $labels['saveintasklist'] = 'shrani v';
+$labels['taskhistory'] = 'Zgodovina';
+$labels['objectchangelog'] = 'Spremeni Zgodovino';
+$labels['objectdiffnotavailable'] = 'Primerjava za izbrane verzije ni na voljo';
 $labels['itipobjectnotfound'] = 'Naloga, na katero se nanaša to sporočilo, ni bila najdena na vašem seznamu.';
 $labels['itipmailbodyaccepted'] = "\$sender je sprejel vabilo na nalogo:\n\n*\$title*\n\nPoteče: \$date\n\nDodeljeno: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender je okvirno sprejel vabilo na nalogo:\n\n*\$title*\n\nPoteče: \$date\n\nDodeljeno: \$attendees";
@@ -153,13 +158,13 @@ $labels['errornotifying'] = 'Napaka. Pošiljanje obvestil sodelujočim ni bilo u
 $labels['removefromcalendar'] = 'Odstrani iz seznama';
 $labels['delegateinvitation'] = 'Prenesi nalogo';
 $labels['andnmore'] = '$nr več...';
-$labels['delegatedto'] = 'Preneseno na:';
-$labels['delegatedfrom'] = 'Preneseno od:';
 $labels['savetotasklist'] = 'Shrani kot nalogo';
 $labels['comment'] = 'Komentar';
+$labels['rsvpcomment'] = 'Komentar';
 $labels['errorimportingtask'] = 'Napaka pri uvozu nalog(e)';
 $labels['importwarningexists'] = 'Različica te naloge že obstaja na vašem seznamu.';
 $labels['importsuccess'] = 'Uspešno uvoženih $nr nalog';
+$labels['importerror'] = 'Pri uvozu je prišlo do napake';
 $labels['newerversionexists'] = 'Obstaja novejša verzija te naloge!';
 $labels['nowritetasklistfound'] = 'Za shranitev naloge ne najdem seznamov';
 $labels['importedsuccessfully'] = 'Naloga je bila uspešno dodana na \'$list\'';
@@ -169,4 +174,3 @@ $labels['itipresponseerror'] = 'Napaka. Pošiljanje odgovora na dodelitev naloge
 $labels['itipinvalidrequest'] = 'To vabilo ni več veljavno';
 $labels['sentresponseto'] = 'Odgovor je bil uspešno poslan na naslov $mailto';
 $labels['successremoval'] = 'Naloga je bila uspešno izbrisana.';
-$labels['arialabelsortmenu'] = 'Nastavitve za sortiranje';
diff --git a/plugins/tasklist/localization/sv_SE.inc b/plugins/tasklist/localization/sv_SE.inc
index a639bd7b..482c5e30 100644
--- a/plugins/tasklist/localization/sv_SE.inc
+++ b/plugins/tasklist/localization/sv_SE.inc
@@ -6,11 +6,17 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
+$labels['navtitle'] = 'Uppgifter';
+$labels['tags'] = 'Taggar';
+$labels['export'] = 'Exportera';
+$labels['exporttitle'] = 'Exportera till iCalendar';
+$labels['exportattachments'] = 'Med bilagor';
 $labels['tasklistsubscribe'] = 'Lista permanent';
 $labels['searchterms'] = 'Sökord';
 $labels['removelist'] = 'Ta bort från lista';
 $labels['printdescriptions'] = 'Skriv ut beskrivning';
 $labels['edit'] = 'Redigera';
+$labels['title'] = 'Titel';
 $labels['description'] = 'Beskrivning';
 $labels['start'] = 'Start';
 $labels['starttime'] = 'Starttid';
@@ -21,11 +27,11 @@ $labels['status'] = 'Status';
 $labels['status-cancelled'] = 'Inställd';
 $labels['created'] = 'Skapad';
 $labels['changed'] = 'Senast ändrad';
+$labels['taskoptions'] = 'Alternativ';
 $labels['all'] = 'Alla';
 $labels['today'] = 'Idag';
 $labels['tomorrow'] = 'Imorgon';
 $labels['removelink'] = 'Ta bort e-postreferens';
-$labels['taskdetails'] = 'Detaljer';
 $labels['save'] = 'Spara';
 $labels['cancel'] = 'Avbryt';
 $labels['tabsummary'] = 'Sammanfattning';
@@ -44,11 +50,13 @@ $labels['roleoptional'] = 'Valfritt';
 $labels['rolechair'] = 'Stol';
 $labels['sendinvitations'] = 'Skicka inbjudningar';
 $labels['itipupdatesubject'] = '"$title" har uppdaterats';
-$labels['itipcancelsubject'] = '"$title" har ställts in';
+$labels['taskhistory'] = 'Historik';
+$labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
 $labels['itipcomment'] = 'Kommentar till inbjudan/meddelande';
 $labels['andnmore'] = '$nr fler ...';
-$labels['delegatedto'] = 'Delegerad till:';
-$labels['delegatedfrom'] = 'Delegerad från:';
 $labels['comment'] = 'Kommentar';
+$labels['rsvpcomment'] = 'Kommentar';
+$labels['importerror'] = 'Ett fel uppstod vid import';
 $labels['attendeupdateesuccess'] = 'Uppdaterade deltagarens status';
 $labels['itipinvalidrequest'] = 'Denna inbjudan är inte längre giltig';
diff --git a/plugins/tasklist/localization/th_TH.inc b/plugins/tasklist/localization/th_TH.inc
index 3305e349..fc6c6f0b 100644
--- a/plugins/tasklist/localization/th_TH.inc
+++ b/plugins/tasklist/localization/th_TH.inc
@@ -10,6 +10,9 @@ $labels['navtitle'] = 'งาน';
 $labels['lists'] = 'รายการงาน';
 $labels['list'] = 'รายการงาน';
 $labels['tags'] = 'แท๊ก';
+$labels['export'] = 'ส่งออก';
+$labels['exporttitle'] = 'ส่งออกไปยัง iCalendar';
+$labels['exportattachments'] = 'พร้อมสิ่งที่แนบมาด้วย';
 $labels['tasklistsubscribe'] = 'จัดแสดงถาวร';
 $labels['listsearchresults'] = 'รายการงานที่มีอยู่';
 $labels['findlists'] = 'ค้นหารายการงาน';
@@ -43,6 +46,7 @@ $labels['status-cancelled'] = 'ยกเลิก';
 $labels['assignedto'] = 'มอบหมายให้';
 $labels['created'] = 'สร้าง';
 $labels['changed'] = 'แก้ไขครั้งสุดท้าย';
+$labels['taskoptions'] = 'ทางเลือก';
 $labels['all'] = 'ทั้งหมด';
 $labels['flagged'] = 'ติดธง';
 $labels['complete'] = 'เสร็จ';
@@ -59,7 +63,6 @@ $labels['mytaskstitle'] = 'งานที่ท่านได้รับม
 $labels['nodate'] = 'ไม่มีกำหนด';
 $labels['removetag'] = 'เอาออก';
 $labels['auto'] = 'อัตโนมัติ';
-$labels['taskdetails'] = 'รายละเอียด';
 $labels['newtask'] = 'งานใหม่';
 $labels['edittask'] = 'แก้ไขงาน';
 $labels['save'] = 'บันทึก';
@@ -87,6 +90,7 @@ $labels['on'] = 'เปิด';
 $labels['at'] = 'ที่';
 $labels['this'] = 'นี้';
 $labels['next'] = 'ถัดไป';
+$labels['yes'] = 'ตกลง';
 $labels['savingdata'] = 'บันทึกข้อมูล';
 $labels['errorsaving'] = 'การบันทึกข้อมูลเกิดข้อผิดพลาด';
 $labels['notasksfound'] = 'ไม่พบงานสำหรับเงื่อนไขที่กำหนด';
@@ -105,6 +109,7 @@ $labels['arialabelsearchform'] = 'ฟอร์มสำหรับค้นห
 $labels['arialabelquicksearchbox'] = 'การป้อนข้อมูลค้นหางาน';
 $labels['arialabellistsearchform'] = 'ฟอร์มสำหรับค้นหารายการงาน';
 $labels['arialabeltaskselector'] = 'รูปแบบการแสดงรายการ';
+$labels['arialabelsortmenu'] = 'ทางเลือกการจัดเรียงงาน';
 $labels['attendee'] = 'ผู้รับมอบ';
 $labels['role'] = 'บทบาท';
 $labels['confirmstate'] = 'สถานะ';
@@ -119,8 +124,10 @@ $labels['sendcancellation'] = 'แจ้งเตือนผู้รับม
 $labels['invitationsubject'] = 'ท่านได้รับมอบหมายให้เป็น "$title"';
 $labels['itipupdatesubject'] = '"$title" ได้รับการปรับปรุงสถานะ';
 $labels['itipupdatesubjectempty'] = 'งานที่ทำให้คุณกังวลได้รับการปรับปรุงสถานะ';
-$labels['itipcancelsubject'] = '"$title" ถูกยกเลิก';
 $labels['saveintasklist'] = 'บันทึกใน';
+$labels['taskhistory'] = 'ประวัติ';
+$labels['objectchangelog'] = 'ประวัติการปรับเปลี่ยน';
+$labels['objectdiffnotavailable'] = 'ไม่สามารถเปรียบเทียบรุ่นการปรับปรุงที่เลือกได้';
 $labels['itipobjectnotfound'] = 'งานที่ถูกอ้างถึงในข้อความนี้ไม่ถูกตรวจพบในรายการงานของคุณ';
 $labels['itipmailbodyaccepted'] = "\$sender ยอมรับการมอบหมายงานหัวข้อ\n\n*\$title*\n\nมีกำหนดเสร็จ \$date\n\nผู้รับผิด่ชอบงาน: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender ปฎิเสธการมอบหมายงานของคุณสำหรับงานต่อไปนี้ :\n\n*\$title*\n\nกำหนดเสร็จ: \$date";
@@ -144,13 +151,13 @@ $labels['errornotifying'] = 'การจัดส่งคำแจ้งเต
 $labels['removefromcalendar'] = 'ลบออกจากงานของฉัน';
 $labels['delegateinvitation'] = 'มอบหมายงาน';
 $labels['andnmore'] = 'มีอีก $nr รายการ';
-$labels['delegatedto'] = 'มอบหมายให้';
-$labels['delegatedfrom'] = 'รับมอบจาก';
 $labels['savetotasklist'] = 'บันทึกเป็นงาน';
 $labels['comment'] = 'ความคิดเห็น';
+$labels['rsvpcomment'] = 'ความคิดเห็น';
 $labels['errorimportingtask'] = 'การนำเข้างานเกิดข้อผิดพลาด';
 $labels['importwarningexists'] = 'สำเนาของงานนี้มีอยู่ในรายการงานของคุณแล้ว';
 $labels['importsuccess'] = 'การนำเข้างานจำนวน $nr รายการเรียบร้อยแล้ว';
+$labels['importerror'] = 'พบข้อผิดพลาดในระหว่างนำเข้า';
 $labels['newerversionexists'] = ' มีข้อมูลงานที่ทันสมัยกว่าอยู่แล้ว...ยกเลิก';
 $labels['nowritetasklistfound'] = 'ไม่พบรายการงานที่จะบันทึกงาน';
 $labels['importedsuccessfully'] = 'งานได้ถูกเพิ่มไปยัง \'$list\' เรียบร้อยแล้ว';
@@ -160,4 +167,3 @@ $labels['itipresponseerror'] = 'การส่งคำตอบสำหรั
 $labels['itipinvalidrequest'] = 'คำเชิญนี้ถูกยกเลิก';
 $labels['sentresponseto'] = 'คำตอบเรื่องการรับมอบงานได้ถูกส่งไปยัง $mailto เรียบร้อยแล้ว';
 $labels['successremoval'] = 'งานถูกลบเรียบร้อยแล้ว';
-$labels['arialabelsortmenu'] = 'ทางเลือกการจัดเรียงงาน';
diff --git a/plugins/tasklist/localization/uk_UA.inc b/plugins/tasklist/localization/uk_UA.inc
index 0ca82008..eb516cf3 100644
--- a/plugins/tasklist/localization/uk_UA.inc
+++ b/plugins/tasklist/localization/uk_UA.inc
@@ -7,6 +7,9 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 $labels['navtitle'] = 'Задачі';
+$labels['export'] = 'Експорт';
+$labels['exporttitle'] = 'Експорт в iCalendar';
+$labels['exportattachments'] = 'Із вкладеннями';
 $labels['tasklistsubscribe'] = 'Завжди показувати';
 $labels['searchterms'] = 'Умови пошуку';
 $labels['removelist'] = 'Вилучити зі списку';
@@ -21,10 +24,10 @@ $labels['status'] = 'Статус';
 $labels['status-cancelled'] = 'Відмінений';
 $labels['created'] = 'Створена';
 $labels['changed'] = 'Змінена';
+$labels['taskoptions'] = 'Опції';
 $labels['all'] = 'Всі';
 $labels['today'] = 'Сьогодні';
 $labels['tomorrow'] = 'Завтра';
-$labels['taskdetails'] = 'Подробиці';
 $labels['save'] = 'Зберегти';
 $labels['cancel'] = 'Відмінити';
 $labels['tabsummary'] = 'Резюме';
@@ -42,9 +45,9 @@ $labels['rolerequired'] = 'Обов\'язковий';
 $labels['roleoptional'] = 'Необов\'язковий';
 $labels['sendinvitations'] = 'Запросити';
 $labels['itipupdatesubject'] = '"$title" була оновлена';
-$labels['itipcancelsubject'] = '"$title" була відмінена';
+$labels['taskhistory'] = 'Історія';
+$labels['objectchangelog'] = 'Історія змін';
 $labels['itipcomment'] = 'Коментар до запрошення/повідомлення';
 $labels['andnmore'] = '$nr більше...';
-$labels['delegatedto'] = 'Доручено:';
-$labels['delegatedfrom'] = 'Доручено від:';
 $labels['comment'] = 'Коментарій';
+$labels['rsvpcomment'] = 'Коментарій';
diff --git a/plugins/tasklist/localization/vi_VN.inc b/plugins/tasklist/localization/vi_VN.inc
new file mode 100644
index 00000000..ff1fa475
--- /dev/null
+++ b/plugins/tasklist/localization/vi_VN.inc
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['export'] = 'Export';
+$labels['exporttitle'] = 'Export to iCalendar';
+$labels['exportattachments'] = 'With attachments';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['searchterms'] = 'Search terms';
+$labels['removelist'] = 'Remove from list';
+$labels['printdescriptions'] = 'Print descriptions';
+$labels['edit'] = 'Edit';
+$labels['description'] = 'Description';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
+$labels['alarms'] = 'Reminder';
+$labels['repeat'] = 'Repeat';
+$labels['status'] = 'Status';
+$labels['status-cancelled'] = 'Cancelled';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['taskoptions'] = 'Options';
+$labels['all'] = 'All';
+$labels['today'] = 'Today';
+$labels['tomorrow'] = 'Tomorrow';
+$labels['save'] = 'Save';
+$labels['cancel'] = 'Cancel';
+$labels['tabsummary'] = 'Summary';
+$labels['tabrecurrence'] = 'Recurrence';
+$labels['tabattachments'] = 'Attachments';
+$labels['tabsharing'] = 'Sharing';
+$labels['listname'] = 'Name';
+$labels['showalarms'] = 'Show reminders';
+$labels['savingdata'] = 'Saving data...';
+$labels['role'] = 'Role';
+$labels['availability'] = 'Avail.';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organizer';
+$labels['rolerequired'] = 'Required';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Chair';
+$labels['sendinvitations'] = 'Send invitations';
+$labels['itipupdatesubject'] = '"$title" has been updated';
+$labels['taskhistory'] = 'History';
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiff'] = 'Changes from revisions $rev';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['andnmore'] = '$nr more...';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
+$labels['importerror'] = 'An error occured while importing';
+$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
diff --git a/plugins/tasklist/localization/zh_CN.inc b/plugins/tasklist/localization/zh_CN.inc
index 3aae42e5..f5a6d8bb 100644
--- a/plugins/tasklist/localization/zh_CN.inc
+++ b/plugins/tasklist/localization/zh_CN.inc
@@ -7,8 +7,11 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 $labels['tags'] = '标签';
+$labels['export'] = '导出';
+$labels['exporttitle'] = '导出到ICalendar';
 $labels['removelist'] = '从列表中移除';
 $labels['edit'] = '编辑';
+$labels['delete'] = '删除';
 $labels['title'] = '标题';
 $labels['description'] = '描述';
 $labels['start'] = '开始';
@@ -20,11 +23,25 @@ $labels['status'] = '状态';
 $labels['status-cancelled'] = '已取消';
 $labels['created'] = '已创建';
 $labels['changed'] = '最后更改';
+$labels['taskoptions'] = '选项';
+$labels['today'] = '今天';
+$labels['tomorrow'] = '明天';
 $labels['save'] = '保存';
 $labels['cancel'] = '取消';
 $labels['tabsummary'] = '汇总';
 $labels['tabsharing'] = '分享';
 $labels['listname'] = '名称';
+$labels['showalarms'] = '显示提醒';
+$labels['at'] = '在';
+$labels['yes'] = '是';
 $labels['savingdata'] = '保存数据...';
+$labels['role'] = '身份';
+$labels['availability'] = '有空';
 $labels['confirmstate'] = '状态';
+$labels['roleorganizer'] = '组织者';
+$labels['rolerequired'] = '必须';
+$labels['roleoptional'] = '可选';
+$labels['sendinvitations'] = '发送邀请';
+$labels['taskhistory'] = '历史';
 $labels['comment'] = '注释';
+$labels['rsvpcomment'] = '注释';
diff --git a/plugins/tasklist/localization/zh_TW.inc b/plugins/tasklist/localization/zh_TW.inc
new file mode 100644
index 00000000..607fe623
--- /dev/null
+++ b/plugins/tasklist/localization/zh_TW.inc
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['export'] = 'Export';
+$labels['exporttitle'] = 'Export to iCalendar';
+$labels['exportattachments'] = 'With attachments';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['searchterms'] = 'Search terms';
+$labels['removelist'] = 'Remove from list';
+$labels['printdescriptions'] = 'Print descriptions';
+$labels['edit'] = 'Edit';
+$labels['description'] = 'Description';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
+$labels['alarms'] = 'Reminder';
+$labels['repeat'] = 'Repeat';
+$labels['status'] = 'Status';
+$labels['status-cancelled'] = 'Cancelled';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['taskoptions'] = 'Options';
+$labels['all'] = 'All';
+$labels['today'] = 'Today';
+$labels['tomorrow'] = 'Tomorrow';
+$labels['save'] = 'Save';
+$labels['cancel'] = 'Cancel';
+$labels['tabsummary'] = 'Summary';
+$labels['tabrecurrence'] = 'Recurrence';
+$labels['tabattachments'] = 'Attachments';
+$labels['tabsharing'] = 'Sharing';
+$labels['listname'] = 'Name';
+$labels['showalarms'] = 'Show reminders';
+$labels['savingdata'] = 'Saving data...';
+$labels['role'] = 'Role';
+$labels['availability'] = 'Avail.';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organizer';
+$labels['rolerequired'] = 'Required';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Chair';
+$labels['sendinvitations'] = 'Send invitations';
+$labels['itipupdatesubject'] = '"$title" has been updated';
+$labels['taskhistory'] = 'History';
+$labels['objectchangelog'] = 'Change History';
+$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['andnmore'] = '$nr more...';
+$labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
+$labels['importerror'] = 'An error occured while importing';
+$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
diff --git a/plugins/tasklist/skins/elastic/templates/dialog.html b/plugins/tasklist/skins/elastic/templates/dialog.html
new file mode 100644
index 00000000..b1c6459d
--- /dev/null
+++ b/plugins/tasklist/skins/elastic/templates/dialog.html
@@ -0,0 +1,7 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="tasklist.arialabeltaskform" /></h1>
+
+<roundcube:include file="/templates/taskedit.html" />
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/tasklist/skins/elastic/templates/mainview.html b/plugins/tasklist/skins/elastic/templates/mainview.html
new file mode 100644
index 00000000..aea44e5f
--- /dev/null
+++ b/plugins/tasklist/skins/elastic/templates/mainview.html
@@ -0,0 +1,332 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
+
+<!-- task folders list -->
+<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
+	<div class="header">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span id="aria-label-tasklists" class="header-title"><roundcube:label name="tasklist.lists" /></span>
+		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
+			title="tasklist.listactions" class="button icon sidebar-menu" data-popup="tasklistactions-menu"
+			innerClass="inner" label="actions" />
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar toolbar"
+		ariatag="h2" label="foldersearchform" label-domain="tasklist" buttontitle="findlists" />
+	<div id="tasklists-content" class="scroller">
+		<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing iconized" />
+	</div>
+</div>
+
+<!-- tasks list -->
+<div class="list listbox selected" aria-labelledby="aria-label-taskslist">
+	<div class="header">
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="tasklist.lists" /></span></a>
+		<span id="aria-label-taskslist" class="header-title"><roundcube:label name="tasklist.navtitle" /></span>
+		<div id="listcontrols" class="toolbar" role="toolbar">
+			<a href="#threads" class="button threads active" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
+				label="options" innerClass="inner" onclick="tasklist_options_menu()" />
+		</div>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+		label="tasksearchform" label-domain="tasklist" buttontitle="tasklist.findtasks" ariatag="h2" />
+	<div class="pagenav pagenav-list toolbar" onclick="UI.switch_nav_list(this)">
+		<a class="button icon expand"><span class="inner"></span></a>
+		<span id="taskselector-name" class="pagenav-text"><roundcube:label name="tasklist.all" /></span>
+	</div>
+	<div id="taskselector-content" class="navlist scroller" aria-labelledby="aria-label-taskselector">
+		<h2 class="voice" id="aria-label-taskselector"><roundcube:label name="tasklist.arialabeltaskselector" /></h2>
+		<ul id="taskselector" class="listing" role="listbox" aria-controls="tasklist">
+			<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /></a></li>
+			<li class="overdue inactive" role="radio" aria-checked="false" aria-labelledby="aria-radio-overdue"><a href="#overdue" id="aria-radio-overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
+			<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
+			<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
+			<roundcube:if condition="env:tasklist_driver != 'kolab'" />
+			<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
+			<roundcube:endif />
+			<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /><span class="count"></span></a></li>
+			<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
+			<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /></a></li>
+			<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+			<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /></a></li>
+			<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
+			<roundcube:endif />
+			<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
+		</ul>
+	</div>
+	<div class="scroller">
+		<h2 id="aria-label-taskslist" class="voice"><roundcube:label name="tasklist.navtitle" /></h2>
+		<roundcube:object name="plugin.tasks" id="tasklist" role="tree"
+			class="listing" role="listbox" data-list="tasklist"
+			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="newtask" />
+	</div>
+</div>
+
+<!-- task details frame -->
+<div class="content" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div id="taskstoolbar" class="toolbar">
+			<roundcube:button command="newtask" type="link"
+				class="button create disabled" classAct="button create"
+				label="create" title="tasklist.newtask" innerClass="inner" data-fab="true" />
+			<roundcube:button command="print" type="link" data-hidden="small"
+				class="button print disabled" classAct="button print"
+				label="print" title="tasklist.printtitle" innerClass="inner" />
+			<roundcube:button command="delete-task" type="link"
+				label="delete" title="tasklist.deletetask"
+				class="button delete disabled" classAct="button delete" innerclass="inner" />
+			<span class="spacer"></span>
+			<roundcube:if condition="config:kolab_bonnie_api" />
+				<roundcube:button command="task-history" type="link"
+					class="button history task-history disabled" classAct="button history task-history"
+					label="tasklist.taskhistory" title="libkolab.showhistory" innerClass="inner" />
+			<roundcube:endif />
+			<roundcube:button command="import" type="link"
+				class="button import disabled" classAct="button import"
+				label="import" title="tasklist.importtasks" innerClass="inner" />
+			<roundcube:button command="export" type="link"
+				class="button export disabled" classAct="button export"
+				label="tasklist.export" title="tasklist.exporttitle" innerClass="inner" />
+			<roundcube:container name="toolbar" id="taskstoolbar" />
+		</div>
+	</div>
+	<!-- task content frame -->
+	<h2 id="aria-label-taskform" class="voice"><roundcube:label name="tasklist.arialabeltaskform" /></h2>
+	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-taskform">
+		<roundcube:include file="/templates/taskedit.html" />
+		<div id="taskshow" class="hidden formcontent propform text-only" data-nodialog="true">
+			<div id="event-status-badge"><span></span></div>
+			<div id="task-parent-title" class="task-parent-title"></div>
+			<h2 id="task-title" class="task-title"></h2>
+			<div id="task-description" class="task-description"></div>
+			<div id="task-attendees" class="form-group row task-attendees">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.assignedto" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-tags" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.tags" /></label>
+				<span class="task-text tagedit col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-start" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.start" /></label>
+				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-starttime"></span></span>
+			</div>
+			<div id="task-date" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.datetime" /></label>
+				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-time"></span></span>
+			</div>
+			<div id="task-recurrence" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.repeat" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-alarm" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.alarms" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-organizer" class="form-group row task-attendees">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.roleorganizer" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-list" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.list" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-completeness" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.complete" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-status" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.status" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-links" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.links" /></label>
+				<span class="task-text col-sm-8"></span>
+			</div>
+			<div id="task-attachments" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
+				<div class="task-text col-sm-8"></div>
+			</div>
+			<div id="task-created" class="form-group row faded">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.created" /></label>
+				<span class="task-text task-created col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-changed" class="form-group row faded">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.changed" /></label>
+				<span class="task-text task-changed col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-rsvp-comment" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.rsvpcomment" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="tasklist-invitebox invitebox boxinformation" style="display:none" />
+		</div>
+		<div class="formbuttons">
+			<roundcube:button command="save-task" label="save"
+				class="btn btn-primary submit disabled" classAct="btn btn-primary submit" innerCLass="inner" />
+			<roundcube:button command="edit-task" label="edit"
+				class="btn btn-primary edit disabled" classAct="btn btn-primary edit" innerclass="inner" />
+			<roundcube:button command="add-child-task" label="tasklist.addsubtask"
+				class="create btn btn-secondary disabled" classAct="create btn btn-secondary" innerclass="inner" />
+		</div>
+	</div>
+</div>
+
+<roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />
+<div id="taskhistory" class="popupmenu" aria-hidden="true">
+	<roundcube:object name="plugin.object_changelog_table" class="changelog-table" />
+	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="taskdiff" class="popupmenu" aria-hidden="true">
+	<div class="form-group row task-parent-title">
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span> &raquo;
+	</div>
+	<h2 class="task-title">Task Title</h2>
+	<h2 class="task-title-new task-text-new"></h2>
+	<div class="form-group row task-description">
+		<label><roundcube:label name="calendar.description" /></label>
+		<div class="task-text-diff" style="white-space:pre-wrap"></div>
+		<div class="task-text-old"></div>
+		<div class="task-text-new"></div>
+	</div>
+	<div class="form-group row task-flagged">
+		<label><roundcube:label name="tasklist.flagged" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-start">
+		<label><roundcube:label name="tasklist.start" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-date">
+		<label><roundcube:label name="tasklist.datetime" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-recurrence">
+		<label><roundcube:label name="tasklist.repeat" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-alarms">
+		<label><roundcube:label name="tasklist.alarms" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-attendees">
+		<label><roundcube:label name="tasklist.assignedto" /><span class="index"></span></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-complete">
+		<label><roundcube:label name="tasklist.complete" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-status">
+		<label><roundcube:label name="tasklist.status" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-links">
+		<label><roundcube:label name="tasklist.links" /><span class="index"></span></label>
+		<span class="task-text"></span>
+	</div>
+	<div class="form-group row task-attachments">
+		<label><roundcube:label name="attachments" /><span class="index"></span></label>
+		<div class="task-text-old"></div>
+		<div class="task-text-new"></div>
+	</div>
+</div>
+<roundcube:endif />
+
+<div id="tasklistactions-menu" class="popupmenu">
+	<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-tasklistoptions">
+		<roundcube:button type="link-menuitem" command="list-create" label="tasklist.createlist" class="create disabled" classAct="create active" />
+		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="list-remove" label="tasklist.removelist" class="remove disabled" classAct="remove active" />
+		<roundcube:endif />
+		<roundcube:if condition="config:calendar_caldav_url" />
+			<roundcube:button type="link-menuitem" command="list-showurl" label="tasklist.showcaldavurl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:endif />
+		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<div id="listoptions-menu" class="popupmenu propform">
+	<h3 id="aria-label-taskviewsortmenu" class="voice"><roundcube:label name="tasklist.arialabelsortmenu" /></h3>
+	<div class="form-group row">
+		<label for="options-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select id="options-sortcol" class="form-control">
+				<option value="auto"><roundcube:label name="tasklist.auto" /></option>
+				<option value="datetime"><roundcube:label name="tasklist.datetime" /></option>
+				<option value="startdatetime"><roundcube:label name="tasklist.start" /></option>
+				<option value="flagged"><roundcube:label name="tasklist.flagged" /></option>
+				<option value="complete"><roundcube:label name="tasklist.completeness" /></option>
+				<option value="changed"><roundcube:label name="tasklist.changed" /></option>
+			</select>
+		</div>
+	</div>
+	<div class="form-group row">
+		<label for="options-ord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select id="options-ord" class="form-control">
+				<option value="asc"><roundcube:label name="sortasc" /></option>
+				<option value="desc"><roundcube:label name="sortdesc" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:add_label name="listoptionstitle" />
+</div>
+
+<div id="threadselect-menu" class="popupmenu">
+	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
+		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all" classAct="expand all active" />
+		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none" classAct="expand none active" />
+	</ul>
+</div>
+
+<div id="tasklistform" class="popupmenu formcontent">
+	<roundcube:label name="loading" />
+	<roundcube:container name="tasklistform" id="tasklistform" />
+</div>
+
+<div id="tasksimport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.tasks_import_form" id="tasks-import-form" />
+</div>
+
+<div id="tasksexport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.tasks_export_form" id="tasks-export-form" />
+</div>
+
+<script>
+rcmail.addEventListener('tasks-insertrow', function(o) {
+    UI.pretty_checkbox($(o.div).find('input'));
+});
+
+$('#taskselector a').on('click', function() {
+    var node = $(this).clone();
+    node.find('span').remove();
+    $('#taskselector-name').text(node.text());
+});
+</script>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/tasklist/skins/elastic/templates/print.html b/plugins/tasklist/skins/elastic/templates/print.html
new file mode 100644
index 00000000..b9587e28
--- /dev/null
+++ b/plugins/tasklist/skins/elastic/templates/print.html
@@ -0,0 +1,15 @@
+<roundcube:include file="includes/layout.html" />
+
+<div class="print-config">
+	<button type="button" class="btn btn-primary print" onclick="window.print()"><roundcube:label name='print' /></button>
+	<span class="prop">
+		<input type="checkbox" id="propdescription" checked="checked" class="pretty-checkbox" onclick="$('#tasklist .description')[this.checked ? 'show' : 'hide']()" />
+		<label for="propdescription"><roundcube:label name="tasklist.printdescriptions" /></label>
+	</span>
+</div>
+
+<div class="print-content">
+	<roundcube:object name="plugin.tasklist_print" id="tasklist" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/tasklist/skins/elastic/templates/taskedit.html b/plugins/tasklist/skins/elastic/templates/taskedit.html
new file mode 100644
index 00000000..19699082
--- /dev/null
+++ b/plugins/tasklist/skins/elastic/templates/taskedit.html
@@ -0,0 +1,127 @@
+<div id="taskedit" class="<roundcube:exp expression="env:framed ? '' : 'hidden '">formcontent" data-nodialog="true" data-notabs="true">
+	<form id="taskeditform" class="tabbed" action="#" method="post" enctype="multipart/form-data">
+		<!-- basic info -->
+		<fieldset id="taskedit-panel-main">
+			<legend><roundcube:label name="tasklist.tabsummary" /></legend>
+			<div class="form-group">
+				<label for="taskedit-title"><roundcube:label name="tasklist.title" /></label>
+				<input type="text" class="form-control" name="title" id="taskedit-title" size="60" />
+			</div>
+			<div class="form-group">
+				<label for="taskedit-description"><roundcube:label name="tasklist.description" /></label>
+				<textarea name="description" id="taskedit-description" class="form-control" rows="5" cols="60"></textarea>
+			</div>
+			<div class="form-group">
+				<label for="tagedit-input"><roundcube:label name="tasklist.tags" /></label>
+				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="0" />
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-startdate" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.start" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="startdate" size="10" id="taskedit-startdate" class="form-control datepicker" /> &nbsp;
+					<input type="text" name="starttime" size="6" id="taskedit-starttime" class="form-control" aria-label="<roundcube:label name='tasklist.starttime' />" />
+					<a href="#nodate" class="edit-nodate" rel="#taskedit-startdate,#taskedit-starttime"><roundcube:label name="tasklist.nodate" /></a>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-date" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.datetime" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="date" size="10" id="taskedit-date" class="form-control datepicker" /> &nbsp;
+					<input type="text" name="time" size="6" id="taskedit-time" class="form-control" aria-label="<roundcube:label name='tasklist.duetime' />" />
+					<a href="#nodate" class="edit-nodate" rel="#taskedit-date,#taskedit-time"><roundcube:label name="tasklist.nodate" /></a>
+				</div>
+			</div>
+			<div class="form-group row" id="taskedit-alarms">
+				<label for="edit-alarm-item" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.alarms" /></label>
+				<div class="col-sm-10 alarms-input">
+					<div class="edit-alarm-item first">
+						<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
+						<span class="edit-alarm-buttons">
+							<a href="#add" class="icon btn button create add-alarm"><span class="inner"><roundcube:label name="libcalendaring.addalarm" /></span></a>
+							<a href="#delete" class="icon btn button delete delete-alarm"><span class="inner"><roundcube:label name="libcalendaring.removealarm" /></span></a>
+						</span>
+					</div>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-completeness" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.complete" /></label>
+				<div class="col-sm-10 input-percent-slider">
+					<input type="text" name="title" id="taskedit-completeness" size="3" autocomplete="off" class="form-control" />
+					<span class="label">%</span><div id="taskedit-completeness-slider"></div>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-status" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.status" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.status_select" id="taskedit-status" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row" id="tasklist-select">
+				<label for="taskedit-tasklist" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.list" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.tasklist_select" id="taskedit-tasklist" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row" id="taskedit-links">
+				<label class="col-sm-2 col-form-label"><roundcube:label name="tasklist.links" /></label>
+				<div class="col-sm-10">
+					<div class="task-text"></div>
+				</div>
+			</div>
+		</fieldset>
+		<!-- recurrence settings -->
+		<fieldset id="taskedit-panel-recurrence">
+			<legend><roundcube:label name="tasklist.tabrecurrence" /></legend>
+			<div class="form-group row">
+				<roundcube:object name="plugin.recurrence_form" part="frequency" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-daily">
+				<roundcube:object name="plugin.recurrence_form" part="daily" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-weekly">
+				<roundcube:object name="plugin.recurrence_form" part="weekly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-monthly">
+				<roundcube:object name="plugin.recurrence_form" part="monthly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-yearly">
+				<roundcube:object name="plugin.recurrence_form" part="yearly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-until">
+				<roundcube:object name="plugin.recurrence_form" part="until" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-rdate">
+				<roundcube:object name="plugin.recurrence_form" part="rdate" class="form-group row" />
+			</div>
+		</fieldset>
+		<!-- attendees list (assignments) -->
+		<fieldset id="taskedit-panel-attendees" data-navlink-class="nav-icon attendees">
+			<legend><roundcube:label name="tasklist.tabassignments" /></legend>
+			<div class="form-group row" id="taskedit-organizer">
+				<label for="edit-identities-list" class="col-form-label col-sm-2"><roundcube:label name="tasklist.roleorganizer" /></label>
+				<roundcube:object name="plugin.identity_select" id="edit-identities-list" class="col-sm-10 form-control" />
+			</div>
+			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="tasklist.arialabeleventassignments" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table no-img table table-sm"
+				coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
+		</fieldset>
+		<!-- attachments list (with upload form) -->
+		<fieldset id="taskedit-panel-attachments" data-navlink-class="nav-icon attachments">
+			<legend><roundcube:label name="tasklist.tabattachments" /></legend>
+			<div id="taskedit-attachments-droparea" class="file-upload">
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
+				<div id="taskedit-attachments-form" class="upload-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+					<roundcube:object name="plugin.attachments_form" mode="hint" />
+					<button type="button" class="btn btn-secondary attach" onclick="rcmail.upload_input('taskedit-attachment-form'); return false"><roundcube:label name="addattachment" /></button>
+				</div>
+				<div id="taskedit-attachments">
+					<roundcube:object name="plugin.attachments_list" id="taskedit-attachment-list" class="attachmentslist" />
+				</div>
+			</div>
+			<roundcube:object name="plugin.filedroparea" id="taskedit-attachments-droparea" />
+		</fieldset>
+	</form>
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" />
+</div>
diff --git a/plugins/tasklist/skins/larry/buttons.png b/plugins/tasklist/skins/larry/buttons.png
deleted file mode 100644
index 7f1a2b63..00000000
Binary files a/plugins/tasklist/skins/larry/buttons.png and /dev/null differ
diff --git a/plugins/tasklist/skins/larry/images/badge_cancelled.png b/plugins/tasklist/skins/larry/images/badge_cancelled.png
deleted file mode 100644
index 2eb48784..00000000
Binary files a/plugins/tasklist/skins/larry/images/badge_cancelled.png and /dev/null differ
diff --git a/plugins/tasklist/skins/larry/images/buttons.png b/plugins/tasklist/skins/larry/images/buttons.png
new file mode 100644
index 00000000..097c8a32
Binary files /dev/null and b/plugins/tasklist/skins/larry/images/buttons.png differ
diff --git a/plugins/tasklist/skins/larry/images/sendinvitation.png b/plugins/tasklist/skins/larry/images/sendinvitation.png
index dea30fab..5e639c48 100644
Binary files a/plugins/tasklist/skins/larry/images/sendinvitation.png and b/plugins/tasklist/skins/larry/images/sendinvitation.png differ
diff --git a/plugins/tasklist/skins/larry/images/sprites.png b/plugins/tasklist/skins/larry/images/sprites.png
new file mode 100644
index 00000000..a9f8a730
Binary files /dev/null and b/plugins/tasklist/skins/larry/images/sprites.png differ
diff --git a/plugins/tasklist/skins/larry/sprites.png b/plugins/tasklist/skins/larry/sprites.png
deleted file mode 100644
index 14f82719..00000000
Binary files a/plugins/tasklist/skins/larry/sprites.png and /dev/null differ
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index a8748ede..ad56ec89 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -11,7 +11,7 @@
  */
 
 #taskbar a.button-tasklist span.button-inner {
-	background-image: url(buttons.png);
+	background-image: url(images/buttons.png);
 	background-position: 0 0;
 }
 
@@ -22,10 +22,22 @@
 
 ul.toolbarmenu li span.icon.taskadd,
 #attachmentmenu li a.tasklistlink span.icon.taskadd {
-	background-image: url(buttons.png);
+	background-image: url(images/buttons.png);
 	background-position: -4px -90px;
 }
 
+#taskstoolbar a.button.export {
+	background-image: url(images/buttons.png);
+	background-position: center -179px;
+	min-width: 50px;
+	max-width: 70px;
+}
+
+#taskstoolbar a.button.import {
+	background-image: url(images/buttons.png);
+	background-position: center -139px;
+}
+
 #taskedit.uidialog,
 .tasklistview div.uidialog {
 	display: none;
@@ -52,17 +64,9 @@ ul.toolbarmenu li span.icon.taskadd,
 	width: 15px;
 }
 
-#tagsbox {
-	position: absolute;
-	top: 42px;
-	left: 0;
-	width: 100%;
-	height: 242px;
-}
-
 #tasklistsbox {
 	position: absolute;
-	top: 300px;
+	top: 42px;
 	left: 0;
 	width: 100%;
 	bottom: 0px;
@@ -93,7 +97,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	top: 68px;
 }
 
-
 #taskselector {
 	margin: -1px 40px 0 0;
 	padding: 0;
@@ -106,7 +109,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	padding-right: 0.3em;
 }
 
-.tagcloud li,
 #taskselector li a {
 	display: inline-block;
 	color: #004458;
@@ -118,12 +120,10 @@ ul.toolbarmenu li span.icon.taskadd,
 	border-color: transparent;
 }
 
-.webkit .tagcloud li,
 .webkit #taskselector li a {
 	padding-bottom: 0.25em;
 }
 
-
 #taskselector li:first-child {
 	border-top: 0;
 	border-radius: 4px 4px 0 0;
@@ -143,20 +143,9 @@ ul.toolbarmenu li span.icon.taskadd,
 	color: #97b3bf;
 }
 
-.tagcloud li.selected,
 #taskselector li.selected a {
 	color: #fff;
 	background: #005d76;
-	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
-	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: linear-gradient(top, #005d76 0%, #004558 100%);
-	box-shadow: inset 0 1px 1px 0 #003645;
-	-o-box-shadow: inset 0 1px 1px 0 #003645;
-	-webkit-box-shadow: inset 0 1px 1px 0 #003645;
-	-moz-box-shadow: inset 0 1px 1px 0 #003645;
-	border-color: #003645;
 	border-radius: 10px;
 	text-shadow: none;
 }
@@ -169,12 +158,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	min-width: 1.8em;
 	padding: 2px 4px;
 	background: #004558;
-	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
-	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: linear-gradient(top, #005d76 0%, #004558 100%);
-	box-shadow: 0 1px 2px 0 rgba(24,24,24,0.6);
 	color: #fff;
 	border-radius: 3px;
 	text-align: center;
@@ -205,51 +188,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	border-color: #ff3800 transparent;
 }
 
-.tagcloud {
-	padding: 0;
-	margin: 6px;
-	list-style: none;
-}
-
-.tagcloud li {
-	display: inline-block;
-	color: #004458;
-	padding-right: 0.2em;
-	margin-right: 0.3em;
-	margin-bottom: 0.4em;
-	min-width: 1.2em;
-	cursor: pointer;
-}
-
-.tagcloud li.inactive {
-	color: #89b3be;
-	padding-right: 0.6em;
-	font-size: 80%;
-/*	display: none; */
-}
-
-.tagcloud li .count {
-	position: relative;
-	top: -1px;
-	margin-left: 5px;
-	padding: 0.15em 0.5em;
-	font-size: 80%;
-	font-weight: bold;
-	color: #59838e;
-	background: #c7e3ef;
-	box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	-o-box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	-webkit-box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	-moz-box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	border-color: #b0ccd7;
-	border-radius: 8px;
-}
-
-.tag-draghelper .tag .count,
-.tagcloud li.inactive .count {
-	display: none;
-}
-
 #tasklistsbox .treelist li {
 	margin: 0;
 	display: block;
@@ -284,7 +222,7 @@ ul.toolbarmenu li span.icon.taskadd,
 	display: block;
 }
 
-#tasklistsbox .treelist li span.listname {
+#tasklistsbox .treelist li a.listname {
 	display: block;
 	position: absolute;
 	top: 7px;
@@ -296,15 +234,15 @@ ul.toolbarmenu li span.icon.taskadd,
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
-	background: url(sprites.png) right 20px no-repeat;
+	background: url(images/sprites.png) right 20px no-repeat;
 }
 
 .quickview-active #tasklistsbox .treelist li input,
-.quickview-active #tasklistsbox .treelist li span.listname {
+.quickview-active #tasklistsbox .treelist li a.listname {
 	opacity: 0.35;
 }
 
-.quickview-active #tasklistsbox .treelist div.focusview span.listname {
+.quickview-active #tasklistsbox .treelist div.focusview a.listname {
 	opacity: 1.0;
 }
 
@@ -322,15 +260,9 @@ ul.toolbarmenu li span.icon.taskadd,
 #tasklistsbox .treelist div:hover span.actions {
 	top: 1px;
 	right: 1px;
-	border: 1px solid #c6c6c6;
+	border: 1px solid #ababab;
 	border-radius: 4px;
-	background: #f7f7f7;
-	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
-	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+	background: #f1f1f1;
 }
 
 #tasklistsbox .treelist div a.remove,
@@ -341,7 +273,7 @@ ul.toolbarmenu li span.icon.taskadd,
 	height: 16px;
 	padding: 0;
 	margin-right: 4px;
-	background: url(sprites.png) -200px 0 no-repeat;
+	background: url(images/sprites.png) -200px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
@@ -391,19 +323,19 @@ ul.toolbarmenu li span.icon.taskadd,
 	outline: 2px solid rgba(30,150,192, 0.5);
 }
 
-#tasklistsbox .treelist li.selected > div > span.listname {
+#tasklistsbox .treelist li.selected > div > a.listname {
 	font-weight: bold;
 }
 
-#tasklistsbox .treelist .readonly > span.listname {
+#tasklistsbox .treelist .readonly > a.listname {
 	background-position: right -142px;
 }
 
-#tasklistsbox .treelist .user > span.listname {
+#tasklistsbox .treelist .user > a.listname {
 	background-position: right -160px;
 }
 
-#tasklistsbox .treelist .virtual > span.listname {
+#tasklistsbox .treelist .virtual > a.listname {
 	color: #aaa;
 	top: 4px;
 	left: 20px;
@@ -461,7 +393,7 @@ ul.toolbarmenu li span.icon.taskadd,
 }
 
 #taskstoolbar a.button.newtask {
-	background-image: url(buttons.png);
+	background-image: url(images/buttons.png);
 	background-position: center -53px;
 }
 
@@ -487,7 +419,7 @@ ul.toolbarmenu li span.icon.taskadd,
 
 #quickaddbox .button {
 	margin-left: 5px;
-	padding: 3px 10px;
+	padding: 4px 10px;
 	font-weight: bold;
 }
 
@@ -497,7 +429,7 @@ ul.toolbarmenu li span.icon.taskadd,
 	left: 0;
 	right: 0;
 	bottom: 0;
-	background: rgba(255, 255, 255, 0.2);
+	background: rgba(255, 255, 255, 0.25);
 	overflow: visible;
 }
 
@@ -522,12 +454,7 @@ ul.toolbarmenu li span.icon.taskadd,
 
 #tasksview .buttonbar {
 	color: #777;
-	background: #eee;
-	background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dfdfdf));
-	background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-	background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-	background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
+	background: #eaeaea;
 	border-bottom: 1px solid #ccc;
 	position: relative;
 	line-height: 13px;
@@ -547,7 +474,7 @@ ul.toolbarmenu li span.icon.taskadd,
 
 .buttonbar-right a.iconbutton {
 	padding: 0;
-	background-image: url(sprites.png);
+	background-image: url(images/sprites.png);
 	background-position: 0 -238px;
 }
 
@@ -566,7 +493,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	font-size: 14px;
 	color: #666;
 	margin: 1.5em;
-	text-shadow: 0px 1px 1px #fff;
 	text-align:center;
 }
 
@@ -599,7 +525,7 @@ ul.toolbarmenu li span.icon.taskadd,
 	
 	width: 14px;
 	height: 14px;
-	background: url(sprites.png) -2px -80px no-repeat;
+	background: url(images/sprites.png) -2px -80px no-repeat;
 	text-indent: -1000px;
 	overflow: hidden;
 }
@@ -615,9 +541,9 @@ ul.toolbarmenu li span.icon.taskadd,
 	border: 1px solid #fff;
 	border-radius: 5px;
 	background: #fff;
-	-webkit-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
-	-moz-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
-	box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
+	-webkit-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.4);
+	-moz-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.4);
+	box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.4);
 	padding-right: 26em;
 	white-space: nowrap;
 	overflow: hidden;
@@ -648,7 +574,7 @@ ul.toolbarmenu li span.icon.taskadd,
 	display: inline-block;
 	width: 16px;
 	height: 16px;
-	background: url(sprites.png) 1000px -3px no-repeat;
+	background: url(images/sprites.png) 1000px -3px no-repeat;
 	margin: -3px 1em 0 0;
 	vertical-align: middle;
 	cursor: pointer;
@@ -676,7 +602,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	text-align: right;
 }
 
-.tag-draghelper .tag,
 .taskhead .tags .tag {
 	font-size: 85%;
 	background: #d9ecf4;
@@ -686,11 +611,6 @@ ul.toolbarmenu li span.icon.taskadd,
 	margin-right: 3px;
 }
 
-.tag-draghelper li.tag {
-	list-style: none;
-	font-size: 100%;
-}
-
 .taskhead .date {
 	position: absolute;
 	top: 4px;
@@ -730,7 +650,7 @@ ul.toolbarmenu li span.icon.taskadd,
 	right: 6px;
 	width: 18px;
 	height: 18px;
-	background: url(sprites.png) 1000px -80px no-repeat;
+	background: url(images/sprites.png) 1000px -80px no-repeat;
 	text-indent: -5000px;
 	overflow: hidden;
 	cursor: pointer;
@@ -772,7 +692,7 @@ ul.toolbarmenu li span.expand,
 ul.toolbarmenu li span.collapse,
 ul.toolbarmenu li span.history,
 ul.toolbarmenu.iconized .selected span.icon {
-	background-image: url(sprites.png);
+	background-image: url(images/sprites.png);
 }
 
 ul.toolbarmenu li span.add {
@@ -804,10 +724,6 @@ ul.toolbarmenu .sortcol.by-auto a {
 }
 
 .taskitem-draghelper {
-/*
-	width: 32px;
-	height: 26px;
-*/
 	background: #444;
 	border: 1px solid #555;
 	border-radius: 4px;
@@ -852,6 +768,18 @@ ul.toolbarmenu .sortcol.by-auto a {
 	display: none;
 }
 
+body.taskdialog {
+	margin: 0;
+	overflow-y: auto;
+}
+
+body.taskdialog #taskedit {
+	display: block;
+	top: 0;
+	padding: 1em;
+	border: 0;
+}
+
 #taskedit {
 	position: relative;
 	top: -1.5em;
@@ -884,10 +812,6 @@ ul.toolbarmenu .sortcol.by-auto a {
 	color: #999;
 }
 
-.taskshow.status-cancelled {
-	background: url(images/badge_cancelled.png) top right no-repeat;
-}
-
 .task-parent-title {
 	position: relative;
 	top: -0.6em;
@@ -957,7 +881,7 @@ a.morelink:hover {
 
 #taskedit .edit-attendees-table th.invite,
 #taskedit .edit-attendees-table td.invite {
-	width: 48px;
+	width: 50px;
 	padding: 2px;
 }
 
@@ -1035,14 +959,14 @@ a.morelink:hover {
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 3px 4px 3px 30px;
+	padding: 2px 4px 2px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	line-height: 20px;
 }
 
-#taskedit-attachments ul li a.file {
+#taskedit-attachments ul li a.filename {
 	padding: 0;
 }
 
@@ -1162,7 +1086,7 @@ label.block {
 
 #taskedit-links .attachmentslist li.message.eml,
 #task-links .attachmentslist li.message.eml {
-	background-image: url(sprites.png);
+	background-image: url(images/sprites.png);
 	background-position: -2px -388px;
 }
 
@@ -1182,10 +1106,13 @@ label.block {
 }
 
 #taskedit-links .task-text {
-	margin-left: 8em;
 	min-height: 22px;
 }
 
+#taskedit-links .attachmentslist li {
+	padding-right: 2em;
+}
+
 #taskedit-links .attachmentslist li a.delete {
 	top: 0;
 	background-position: -6px -378px;
@@ -1259,18 +1186,18 @@ label.block {
 	min-height: 290px;
 }
 
-.tasklistview .uidialog .propform #taskedit-tasklistame {
+.tasklistview .uidialog .propform #taskedit-tasklistname {
 	width: 20em;
 }
 
-.task-dialog-message {
+.dialog-message {
 	margin-top: 0.5em;
 	padding: 0.8em;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
 }
 
-.task-dialog-message .message,
+.dialog-message .message,
 .task-update-confirm .message {
 	margin-bottom: 0.5em;
 }
@@ -1411,7 +1338,7 @@ div.messagetasklinks::before {
 	left: 8px;
 	width: 18px;
 	height: 18px;
-	background: url(buttons.png) -6px -115px no-repeat;
+	background: url(images/buttons.png) -6px -115px no-repeat;
 }
 
 div.messagetasklinks ul.tasklist {
@@ -1450,62 +1377,19 @@ div.messagetasklinks .messagetaskref input.complete {
 	vertical-align: middle;
 }
 
-
-.tasklist.attachmentwin #attachmenttoolbar {
-	position: relative;
-	top: -6px;
-	height: 40px;
+.form-section label + div {
+	line-height: 2;
+	vertical-align: top;
 }
 
-.tasklist.attachmentwin #attachmentcontainer {
-	position: absolute;
-	top: 0;
-	left: 232px;
-	right: 0;
-	bottom: 0;
+.form-section label + div {
+	display: inline-block;
 }
 
-.tasklist.attachmentwin #attachmentframe {
-	width: 100%;
-	height: 100%;
-	border: 0;
-	background-color: #fff;
-	border-radius: 4px;
+.col-form-label {
+	line-height: 2;
 }
 
-.tasklist.attachmentwin #partheader {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 220px;
-	bottom: 0;
-}
-
-.tasklist.attachmentwin #partheader table {
-	table-layout: fixed;
-	overflow: hidden;
-}
-
-.tasklist.attachmentwin #partheader table td {
-	color: #666;
-	padding: 4px 6px;
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
-
-.tasklist.attachmentwin #partheader table td.header {
-	font-weight: bold;
-}
-
-.tasklist.attachmentwin #partheader table td.title {
-	width: 60px;
-	padding-right: 0;
-}
-
-
-/** Special hacks for IE7 **/
-/** They need to be in this file to also affect the task-create dialog embedded in mail view **/
-
-html.ie7 #taskedit-completeness-slider {
-	display: inline;
+.col-sm-4 {
+	min-width: 8em !important;
 }
diff --git a/plugins/tasklist/skins/larry/templates/dialog.html b/plugins/tasklist/skins/larry/templates/dialog.html
new file mode 100644
index 00000000..306febf0
--- /dev/null
+++ b/plugins/tasklist/skins/larry/templates/dialog.html
@@ -0,0 +1,12 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="iframe taskdialog noscroll">
+
+<roundcube:include file="/templates/taskedit.html" />
+
+</body>
+</html>
diff --git a/plugins/tasklist/skins/larry/templates/kolabacl.html b/plugins/tasklist/skins/larry/templates/kolabacl.html
deleted file mode 100644
index 1cf26fc7..00000000
--- a/plugins/tasklist/skins/larry/templates/kolabacl.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<style type="text/css" media="screen">
-
-body.aclform {
-	background: #efefef;
-	margin: 0;
-}
-
-body.aclform .hint {
-	margin: 1em;
-}
-
-</style>
-</head>
-<body class="iframe aclform">
-
-<roundcube:object name="folderacl" />
-
-<roundcube:include file="/includes/footer.html" />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/tasklist/skins/larry/templates/mainview.html b/plugins/tasklist/skins/larry/templates/mainview.html
index 24f71015..ef14037a 100644
--- a/plugins/tasklist/skins/larry/templates/mainview.html
+++ b/plugins/tasklist/skins/larry/templates/mainview.html
@@ -17,16 +17,11 @@
 		<div id="taskstoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 			<roundcube:button command="newtask" type="link" class="button newtask disabled" classAct="button newtask" classSel="button newtask pressed" label="tasklist.newtask" title="tasklist.newtask" />
 			<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="tasklist.printtitle" />
+			<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="tasklist.importtasks" />
+			<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="tasklist.export" title="tasklist.exporttitle" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
 
-		<div id="tagsbox" class="uibox listbox">
-			<h2 class="boxtitle" id="aria-label-tagsbox"><roundcube:label name="tasklist.tags" id="taglist" /></h2>
-			<div class="scroller">
-				<roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" role="region" aria-labelledby="aria-label-tagsbox" aria-controls="thelist" />
-			</div>
-		</div>
-
 		<div id="tasklistsbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-tasklists">
 			<h2 class="boxtitle" id="aria-label-tasklists"><roundcube:label name="tasklist.lists" />
 				<a href="#tasklists" class="iconbutton search" title="<roundcube:label name='tasklist.findlists' />" tabindex="0"><roundcube:label name="tasklist.findlists" /></a>
@@ -37,31 +32,31 @@
 					<label for="tasklistsearch" class="voice"><roundcube:label name="tasklist.searchterms" /></label>
 					<input type="text" name="q" id="tasklistsearch" placeholder="<roundcube:label name='tasklist.findlists' />" />
 					<a class="iconbutton searchicon"></a>
-					<roundcube:button command="reset-listsearch" id="tasklistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+					<roundcube:button type="link" command="reset-listsearch" id="tasklistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller withfooter">
 			<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing" />
 			</div>
 			<div class="boxfooter">
-				<roundcube:button command="list-create" type="link" title="tasklist.createlist" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="tasklist.createlist" /><roundcube:button name="tasklistoptionslink" id="tasklistoptionsmenulink" type="link" title="tasklist.listactions" class="listbutton groupactions" onclick="return UI.toggle_popup('tasklistoptionsmenu', event, { above:true })" innerClass="inner" label="tasklist.listactions" aria-haspopup="true" aria-expanded="false" aria-owns="tasklistoptionsmenu-menu" />
+				<roundcube:button type="link" command="list-create" type="link" title="tasklist.createlist" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="tasklist.createlist" /><roundcube:button name="tasklistoptionslink" id="tasklistoptionsmenulink" type="link" title="tasklist.listactions" class="listbutton groupactions" onclick="return UI.toggle_popup('tasklistoptionsmenu', event, { above:true })" innerClass="inner" label="tasklist.listactions" aria-haspopup="true" aria-expanded="false" aria-owns="tasklistoptionsmenu-menu" />
 			</div>
 		</div>
 
 		<div id="tasklistoptionsmenu" class="popupmenu" aria-hidden="true">
 			<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
 			<ul class="toolbarmenu" id="tasklistoptionsmenu-menu" role="menu" aria-labelledby="aria-label-tasklistoptions">
-				<li role="menuitem"><roundcube:button command="list-edit" label="edit" classAct="active" /></li>
-				<li role="menuitem"><roundcube:button command="list-delete" label="delete" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-edit" label="edit" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-delete" label="delete" classAct="active" /></li>
 				<!--<li role="menuitem"><roundcube:button command="list-import" label="tasklist.import" classAct="active" /></li>-->
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-				<li role="menuitem"><roundcube:button command="list-remove" label="tasklist.removelist" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-remove" label="tasklist.removelist" classAct="active" /></li>
 				<roundcube:endif />
 				<roundcube:if condition="config:calendar_caldav_url" />
-				<li role="menuitem"><roundcube:button command="list-showurl" label="tasklist.showcaldavurl" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-showurl" label="tasklist.showcaldavurl" classAct="active" /></li>
 				<roundcube:endif />
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-				<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
 				<roundcube:endif />
 			</ul>
 		</div>
@@ -79,25 +74,25 @@
 		<label for="quicksearchbox" class="voice"><roundcube:label name="tasklist.arialabelquicksearchbox" /></label>
 		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
 		<a id="searchmenulink" class="iconbutton searchoptions" > </a>
-		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+		<roundcube:button type="link" command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
 
 	<div id="tasksview" class="uibox">
 		<div class="boxtitle buttonbar">
 			<h2 id="aria-label-taskselector" class="voice"><roundcube:label name="tasklist.arialabeltaskselector" /></h2>
 			<ul id="taskselector" role="radiogroup" aria-labelledby="aria-label-taskselector" aria-controls="thelist">
-				<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /><span class="count"></span></a></li>
+				<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /></a></li>
 				<li class="overdue inactive" role="radio" aria-checked="false" aria-labelledby="aria-radio-overdue"><a href="#overdue" id="aria-radio-overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
-				<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /><span class="count"></span></a></li>
 				<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
 				<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
 				<roundcube:if condition="env:tasklist_driver != 'kolab'" />
 				<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
 				<roundcube:endif />
-				<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /></a></li>
+				<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /><span class="count"></span></a></li>
 				<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
+				<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /></a></li>
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-				<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /><span class="count"></span></a></li>
+				<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /></a></li>
 				<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
 				<roundcube:endif />
 				<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
@@ -129,8 +124,8 @@
 			<div id="taskviewactions" class="popupmenu" aria-hidden="true" data-align="right">
 				<h3 id="aria-label-taskviewactions" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
 				<ul class="toolbarmenu" id="taskviewactions-menu" role="menu" aria-labelledby="aria-label-taskviewactions">
-					<li role="menuitem"><roundcube:button command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
-					<li role="menuitem"><roundcube:button command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
+					<li role="menuitem"><roundcube:button type="link" command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
+					<li role="menuitem"><roundcube:button type="link" command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
 				</ul>
 			</div>
 		</div>
@@ -164,6 +159,7 @@
 
 <div id="taskshow" class="taskshow">
 	<div id="task-parent-title" class="form-section task-parent-title"></div>
+	<div id="event-status-badge"><span></span></div>
 	<div class="form-section">
 		<h2 id="task-title"></h2>
 	</div>
@@ -239,7 +235,7 @@
 		<span class="task-text"></span>
 	</div>
 
-	<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="task-dialog-message" style="display:none" />
+	<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="dialog-message" style="display:none" />
 </div>
 
 <roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />
@@ -320,14 +316,20 @@
 	<roundcube:container name="tasklistform" id="tasklistform" />
 </div>
 
+<div id="tasksimport" class="uidialog">
+	<roundcube:object name="plugin.tasks_import_form" id="tasks-import-form" uploadFieldSize="30" />
+</div>
+
+<div id="tasksexport" class="uidialog">
+	<roundcube:object name="plugin.tasks_export_form" id="tasks-export-form" />
+</div>
+
 <script type="text/javascript">
 
 // UI startup
 var UI = new rcube_mail_ui();
 
 $(document).ready(function(e){
-	UI.init();
-
 	rcmail.addEventListener('tasklist_editform_load', function(e){
 		if (rcmail.env.tasklist_driver == 'kolab')
 			UI.init_tabs($('#tasklistform > form').addClass('propform tabbed'));
@@ -335,8 +337,6 @@ $(document).ready(function(e){
 
 	new rcube_splitter({ id:'taskviewsplitter', p1:'#sidebar', p2:'#mainview-right',
 		orientation:'v', relative:true, start:240, min:180, size:12 }).init();
-	new rcube_splitter({ id:'taskviewsplitterv', p1:'#tagsbox', p2:'#tasklistsbox',
-		orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
 
 	// animation to unfold list search box
 	$('#tasklistsbox .boxtitle a.search').click(function(e){
diff --git a/plugins/tasklist/skins/larry/templates/taskedit.html b/plugins/tasklist/skins/larry/templates/taskedit.html
index 81556681..80940eb5 100644
--- a/plugins/tasklist/skins/larry/templates/taskedit.html
+++ b/plugins/tasklist/skins/larry/templates/taskedit.html
@@ -1,4 +1,4 @@
-<div id="taskedit" class="uidialog uidialog-tabbed">
+<div id="taskedit" class="uidialog uidialog-tabbed"<roundcube:exp expression="env:framed ? 'data-nodialog=true' : ''">>
 	<form id="taskeditform" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#taskedit-panel-main"><roundcube:label name="tasklist.tabsummary" /></a></li><li><a href="#taskedit-panel-recurrence"><roundcube:label name="tasklist.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#taskedit-panel-attendees"><roundcube:label name="tasklist.tabassignments" /></a></li><li id="taskedit-tab-attachments"><a href="#taskedit-panel-attachments"><roundcube:label name="tasklist.tabattachments" /></a></li>
@@ -17,7 +17,7 @@
 			</div>
 			<div class="form-section">
 				<label for="tagedit-input"><roundcube:label name="tasklist.tags" /></label>
-				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="0" />
+				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit tagline" tabindex="0" />
 			</div>
 			<div class="form-section">
 				<label for="taskedit-startdate"><roundcube:label name="tasklist.start" /></label>
@@ -92,20 +92,21 @@
 			</div>
 			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="tasklist.arialabeleventassignments" /></h3>
 			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
-			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
-			<roundcube:include file="/templates/freebusylegend.html" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" size="30" />
 		</div>
 		<!-- attachments list (with upload form) -->
 		<div id="taskedit-panel-attachments">
 			<div id="taskedit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="taskedit-attachment-list" class="attachmentslist" />
 			</div>
-			<div id="taskedit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+			<div id="taskedit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform" style="text-align:center">
 				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
-				<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" attachmentFieldSize="30" />
+				<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="hint" />
+				<a class="button" tabindex="1" href="#" onclick="rcmail.upload_input('taskedit-attachment-form')"><roundcube:label name="addattachment" /></a>
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="taskedit-panel-attachments" />
 		</div>
 	</form>
-	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="task-dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" />
 </div>
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 4d1ac570..122905d2 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -58,7 +58,6 @@ function rcube_tasklist_ui(settings)
     };
 
     /*  private vars  */
-    var tagsfilter = [];
     var filtermask = FILTER_MASK_ALL;
     var loadstate = { filter:-1, lists:'', search:null };
     var idcount = 0;
@@ -69,13 +68,12 @@ function rcube_tasklist_ui(settings)
     var taskcounts = {};
     var listindex = [];
     var listdata = {};
-    var tags = [];
+    var tagsfilter = [];
     var draghelper;
     var search_request;
     var search_query;
     var completeness_slider;
     var task_draghelper;
-    var tag_draghelper;
     var task_drag_active = false;
     var list_scroll_top = 0;
     var scroll_delay = 400;
@@ -93,11 +91,11 @@ function rcube_tasklist_ui(settings)
     // general datepicker settings
     var datepicker_settings = {
       // translate from PHP format to datepicker format
-      dateFormat: settings['date_format'].replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
-      firstDay : settings['first_day'],
-//      dayNamesMin: settings['days_short'],
-//      monthNames: settings['months'],
-//      monthNamesShort: settings['months'],
+      dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
+      firstDay : settings.first_day,
+//      dayNamesMin: settings.days_short,
+//      monthNames: settings.months,
+//      monthNamesShort: settings.months,
       changeMonth: false,
       showOtherMonths: true,
       selectOtherMonths: true
@@ -106,8 +104,8 @@ function rcube_tasklist_ui(settings)
 
     /*  public members  */
     this.tasklists = rcmail.env.tasklists;
-    this.selected_task;
-    this.selected_list;
+    this.selected_task = null;
+    this.selected_list = null;
 
     /*  public methods  */
     this.init = init;
@@ -122,6 +120,8 @@ function rcube_tasklist_ui(settings)
     this.list_remove = list_remove;
     this.list_showurl = list_showurl;
     this.list_edit_dialog = list_edit_dialog;
+    this.list_set_sort_and_order = list_set_sort_and_order;
+    this.get_setting = get_setting;
     this.unlock_saving = unlock_saving;
 
     /* imports */
@@ -139,10 +139,32 @@ function rcube_tasklist_ui(settings)
     function init()
     {
         if (rcmail.env.action == 'print' && rcmail.task == 'tasks') {
+            filtermask = rcmail.env.filtermask;
             data_ready({data: rcmail.env.tasks});
             return;
         }
 
+        if (rcmail.env.action == 'dialog-ui') {
+            task_edit_dialog(null, 'new', rcmail.env.task_prop);
+
+            rcmail.addEventListener('plugin.unlock_saving', function(status) {
+                unlock_saving();
+
+                if (status) {
+                    var rc = window.parent.rcmail,
+                        win = rc.env.contentframe ? rc.get_frame_window(rc.env.contentframe) : window.parent;
+
+                   if (win) {
+                        win.location.reload();
+                    }
+
+                    window.parent.kolab_task_dialog_element.dialog('destroy');
+                }
+            });
+
+            return;
+        }
+
         // initialize task list selectors
         for (var id in me.tasklists) {
             if (settings.selected_list && me.tasklists[settings.selected_list] && !me.tasklists[settings.selected_list].active) {
@@ -150,11 +172,14 @@ function rcube_tasklist_ui(settings)
                 me.selected_list = settings.selected_list;
                 $(rcmail.gui_objects.tasklistslist).find("input[value='"+settings.selected_list+"']").prop('checked', true);
             }
-            if (me.tasklists[id].editable && (!me.selected_list || me.tasklists[id].default || (me.tasklists[id].active && !me.tasklists[me.selected_list].active))) {
+            if (me.tasklists[id].editable && (!me.selected_list || me.tasklists[id]['default'] || (me.tasklists[id].active && !me.tasklists[me.selected_list].active))) {
                 me.selected_list = id;
             }
         }
 
+        if (rcmail.env.source && me.tasklists[rcmail.env.source])
+            me.selected_list = rcmail.env.source;
+
         // initialize treelist widget that controls the tasklists list
         var widget_class = window.kolab_folderlist || rcube_treelist_widget;
         tasklists_widget = new widget_class(rcmail.gui_objects.tasklistslist, {
@@ -169,12 +194,14 @@ function rcube_tasklist_ui(settings)
         });
         tasklists_widget.addEventListener('select', function(node) {
             var id = $(this).data('id');
-            rcmail.enable_command('list-edit', has_permission(me.tasklists[node.id], 'wa'));
-            rcmail.enable_command('list-delete', has_permission(me.tasklists[node.id], 'xa'));
-            rcmail.enable_command('list-import', has_permission(me.tasklists[node.id], 'i'));
+            rcmail.enable_command('list-edit', me.has_permission(me.tasklists[node.id], 'wa'));
+            rcmail.enable_command('list-delete', me.has_permission(me.tasklists[node.id], 'xa'));
+            rcmail.enable_command('list-import', me.has_permission(me.tasklists[node.id], 'i'));
             rcmail.enable_command('list-remove', me.tasklists[node.id] && me.tasklists[node.id].removable);
             rcmail.enable_command('list-showurl', me.tasklists[node.id] && !!me.tasklists[node.id].caldavurl);
             me.selected_list = node.id;
+            rcmail.update_state({source: node.id});
+            rcmail.triggerEvent('show-list', {title: me.tasklists[node.id].name});
         });
         tasklists_widget.addEventListener('subscribe', function(p) {
             var list;
@@ -203,9 +230,19 @@ function rcube_tasklist_ui(settings)
             if (data.length)
                 rcmail.display_message(rcmail.gettext('nrtasklistsfound','tasklist').replace('$nr', data.length), 'voice');
             else
-                rcmail.display_message(rcmail.gettext('notasklistsfound','tasklist'), 'info');
+                rcmail.display_message(rcmail.gettext('notasklistsfound','tasklist'), 'notice');
         });
 
+        // Make Elastic checkboxes pretty
+        if (window.UI && UI.pretty_checkbox) {
+            $(rcmail.gui_objects.tasklistslist).find('input[type=checkbox]').each(function() {
+                UI.pretty_checkbox($(this).addClass('flex-checkbox'));
+            });
+            tasklists_widget.addEventListener('add-item', function(prop) {
+                UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+            });
+        }
+
         // init (delegate) event handler on tasklist checkboxes
         tasklists_widget.container.on('click', 'input[type=checkbox]', function(e) {
             var list, id = this.value;
@@ -276,12 +313,16 @@ function rcube_tasklist_ui(settings)
         rcmail.addEventListener('plugin.update_tasklist', update_list);
         rcmail.addEventListener('plugin.destroy_tasklist', destroy_list);
         rcmail.addEventListener('plugin.unlock_saving', unlock_saving);
+        rcmail.addEventListener('plugin.refresh_tagcloud', function() { update_tagcloud(); });
         rcmail.addEventListener('requestrefresh', before_refresh);
         rcmail.addEventListener('plugin.reload_data', function(){
             list_tasks(null, true);
             setTimeout(fetch_counts, 200);
         });
 
+        rcmail.addEventListener('plugin.import_success', function(p){ rctasks.import_success(p); });
+        rcmail.addEventListener('plugin.import_error', function(p){ rctasks.import_error(p); });
+
         rcmail.addEventListener('plugin.task_render_changelog', task_render_changelog);
         rcmail.addEventListener('plugin.task_show_diff', task_show_diff);
         rcmail.addEventListener('plugin.task_show_revision', function(data){ task_show_dialog(null, data, true); });
@@ -319,13 +360,14 @@ function rcube_tasklist_ui(settings)
 
         // quick-add a task
         $(rcmail.gui_objects.quickaddform).submit(function(e){
+            if (saving_lock)
+                return false;
+
             var tasktext = this.elements.text.value,
                 rec = { id:-(++idcount), title:tasktext, readonly:true, mask:0, complete:0 };
 
             if (tasktext && tasktext.length) {
                 save_task({ tempid:rec.id, raw:tasktext, list:me.selected_list }, 'new');
-                render_task(rec);
-
                 $('#listmessagebox').hide();
             }
 
@@ -334,57 +376,6 @@ function rcube_tasklist_ui(settings)
             return false;
         }).find('input[type=text]').placeholder(rcmail.gettext('createnewtask','tasklist'));
 
-        // click-handler on tags list
-        $(rcmail.gui_objects.tagslist).on('click', 'li', function(e){
-            var item = e.target.nodeName == 'LI' ? $(e.target) : $(e.target).closest('li'),
-                tag = item.data('value');
-
-            if (!tag)
-                return false;
-
-            // reset selection on regular clicks
-            var index = $.inArray(tag, tagsfilter);
-            var shift = e.shiftKey || e.ctrlKey || e.metaKey;
-
-            if (!shift) {
-                if (tagsfilter.length > 1)
-                    index = -1;
-
-                $('li', rcmail.gui_objects.tagslist).removeClass('selected').attr('aria-checked', 'false');
-                tagsfilter = [];
-            }
-
-            // add tag to filter
-            if (index < 0) {
-                item.addClass('selected').attr('aria-checked', 'true');
-                tagsfilter.push(tag);
-            }
-            else if (shift) {
-                item.removeClass('selected').attr('aria-checked', 'false');
-                var a = tagsfilter.slice(0,index);
-                tagsfilter = a.concat(tagsfilter.slice(index+1));
-            }
-
-            list_tasks();
-
-            // clear text selection in IE after shift+click
-            if (shift && document.selection)
-              document.selection.empty();
-
-            e.preventDefault();
-            return false;
-        })
-        .on('keypress', 'li', function(e) {
-            if (e.keyCode == 13) {
-                $(this).trigger('click', { pointerType:'keyboard' });
-            }
-        })
-        .mousedown(function(e){
-            // disable content selection with the mouse
-            e.preventDefault();
-            return false;
-        });
-
         // click-handler on task list items (delegate)
         $(rcmail.gui_objects.resultlist).on('click', function(e){
             var item = $(e.target);
@@ -409,7 +400,7 @@ function rcube_tasklist_ui(settings)
                 case 'childtoggle':
                     rec.collapsed = !rec.collapsed;
                     li.children('.childtasks:first').toggle().attr('aria-hidden', rec.collapsed ? 'true' : 'false');
-                    $(e.target).toggleClass('collapsed').html(rec.collapsed ? '&#9654;' : '&#9660;');
+                    $(e.target).toggleClass('collapsed').html('').append($('<span class="inner">').text(rec.collapsed ? '&#9654;' : '&#9660;'));
                     rcmail.http_post('tasks/task', { action:'collapse', t:{ id:rec.id, list:rec.list }, collapsed:rec.collapsed?1:0 });
                     if (e.shiftKey)  // expand/collapse all childs
                         li.children('.childtasks:first .childtoggle.'+(rec.collapsed?'expanded':'collapsed')).click();
@@ -437,7 +428,7 @@ function rcube_tasklist_ui(settings)
                         return false;
 
                     var link = $(e.target).html(''),
-                        input = $('<input type="text" size="10" />').appendTo(link).val(rec.date || '')
+                        input = $('<input type="text" size="10" />').appendTo(link).val(rec.date || '');
 
                     input.datepicker($.extend({
                         onClose: function(dateText, inst) {
@@ -477,8 +468,11 @@ function rcube_tasklist_ui(settings)
                     return true;
 
                 default:
-                    if (e.target.nodeName != 'INPUT')
+                    if (e.target.nodeName != 'INPUT') {
                         task_show_dialog(id);
+                        $(rcmail.gui_objects.resultlist).find('.selected').removeClass('selected');
+                        $(item).addClass('selected');
+                    }
                     break;
             }
 
@@ -497,6 +491,9 @@ function rcube_tasklist_ui(settings)
                     task_edit_dialog(id, 'edit');
                 clearSelection();
             }
+
+            $(rcmail.gui_objects.resultlist).find('.selected').removeClass('selected');
+            $(item).addClass('selected');
         })
         .on('keydown', '.taskhead', function(e) {
             if (e.target.nodeName == 'INPUT' && e.target.type == 'text')
@@ -546,12 +543,16 @@ function rcube_tasklist_ui(settings)
                     focused_subclass = item.get(0) !== e.target ? e.target.className : null;
                 }
             }
+
+            $(item).addClass('focused');
         })
         .on('focusout', '.taskhead', function(e){
             var item = $(e.target);
             if (focused_task && item.data('id') == focused_task) {
                 focused_task = focused_subclass = null;
             }
+
+            $(item).removeClass('focused');
         });
 
         /**
@@ -639,6 +640,70 @@ function rcube_tasklist_ui(settings)
                 }, 1);
             }
         }, datepicker_settings);
+
+        rcmail.addEventListener('kolab-tags-search', filter_tasks)
+            .addEventListener('kolab-tags-drop-data', function(e) { return listdata[e.id]; })
+            .addEventListener('kolab-tags-drop', function(e) {
+                var rec = listdata[e.id];
+                if (rec && rec.id && e.tag) {
+                    if (!rec.tags)
+                        rec.tags = [];
+                    rec.tags.push(e.tag);
+                    save_task(rec, 'edit');
+                }
+            });
+
+        // Create simple list widget replacement for Elastic skin,
+        // as we do not use list nor treelist widget for tasks list
+        rcmail.tasklist = {
+            _find_sibling: function(dir) {
+                if (me.selected_task && me.selected_task.id) {
+                    var n = false,
+                        target = $('li[rel="' + me.selected_task.id + '"] > .taskhead', rcmail.gui_objects.resultlist)[0],
+                        items = $(rcmail.gui_objects.resultlist).find('.taskhead');
+
+                    items.each(function(i, item) {
+                        if (item === target) {
+                            n = i;
+                            return false;
+                        }
+                    });
+
+                    if (n !== false) {
+                        return items[n + dir];
+                    }
+                }
+            },
+            get_single_selection: function() {
+                if (me.selected_task) {
+                    return me.selected_task.id;
+                }
+            },
+            get_node: function(uid) {
+                if (me.selected_task && me.selected_task.id) {
+                    return {collapsed: true};
+                }
+            },
+            expand: function() {
+                if (me.selected_task && me.selected_task.id) {
+                    var parent = $('li[rel="' + me.selected_task.id + '"]', rcmail.gui_objects.resultlist).parent('.childtasks')[0];
+                    if (parent) {
+                        $(parent).parent().children('.childtoggle.collapsed').click();
+                    }
+                }
+            },
+            get_next: function() {
+                return rcmail.tasklist._find_sibling(1);
+            },
+            get_prev: function() {
+                return rcmail.tasklist._find_sibling(-1);
+            },
+            select: function(node) {
+                $(node).click();
+            }
+        };
+
+        rcmail.triggerEvent('tasklist-init');
     }
 
     /**
@@ -646,20 +711,23 @@ function rcube_tasklist_ui(settings)
      */
     function init_taskedit()
     {
-        $('#taskedit').tabs({
+        $('#taskedit:not([data-notabs])').tabs({
             activate: function(event, ui) {
                 // reset autocompletion on tab change (#3389)
-                if (ui.oldPanel.selector == '#taskedit-panel-attendees') {
-                    rcmail.ksearch_blur();
-                }
+                rcmail.ksearch_blur();
             }
         });
 
-        var completeness_slider_change = function(e, ui){
-          var v = completeness_slider.slider('value');
-          if (v >= 98) v = 100;
-          if (v <= 2)  v = 0;
-          $('#taskedit-completeness').val(v);
+        $('#taskedit li.nav-item a').on('click', function() {
+            // reset autocompletion on tab change (#3389)
+            rcmail.ksearch_blur();
+        });
+
+        var completeness_slider_change = function(e, ui) {
+            var v = completeness_slider.slider('value');
+            if (v >= 98) v = 100;
+            if (v <= 2)  v = 0;
+            $('#taskedit-completeness').val(v);
         };
         completeness_slider = $('#taskedit-completeness-slider').slider({
             range: 'min',
@@ -683,67 +751,52 @@ function rcube_tasklist_ui(settings)
             return false;
         });
 
-      // init attendees autocompletion
-      var ac_props;
-      // parallel autocompletion
-      if (rcmail.env.autocomplete_threads > 0) {
-        ac_props = {
-          threads: rcmail.env.autocomplete_threads,
-          sources: rcmail.env.autocomplete_sources
-        };
-      }
-      rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
-      rcmail.addEventListener('autocomplete_insert', function(e) {
-          var success = false;
-          if (e.field.name == 'participant') {
-              success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:(e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL') });
-          }
-          if (e.field && success) {
-              e.field.value = '';
-          }
-      });
-
-      $('#edit-attendee-add').click(function() {
-          var input = $('#edit-attendee-name');
-          rcmail.ksearch_blur();
-          if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'INDIVIDUAL' })) {
-              input.val('');
-          }
-      });
-
-      // handle change of "send invitations" checkbox
-      $('#edit-attendees-invite').change(function() {
-        $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
-        // hide/show comment field
-        $('#taskeditform .attendees-commentbox')[this.checked ? 'show' : 'hide']();
-      });
-
-      // delegate change task to "send invitations" checkbox
-      $('#edit-attendees-donotify').change(function() {
-        $('#edit-attendees-invite').click();
-        return false;
-      });
-    }
-
-    /**
-     * Check permissions on the given list object
-     */
-    function has_permission(list, perm)
-    {
-        // multiple chars means "either of"
-        if (String(perm).length > 1) {
-            for (var i=0; i < perm.length; i++) {
-                if (has_permission(list, perm[i])) {
-                    return true;
-                }
+        // init attendees autocompletion
+        var ac_props;
+        // parallel autocompletion
+        if (rcmail.env.autocomplete_threads > 0) {
+            ac_props = {
+                threads: rcmail.env.autocomplete_threads,
+                sources: rcmail.env.autocomplete_sources
+            };
+        }
+        rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
+        rcmail.addEventListener('autocomplete_insert', function(e) {
+            var cutype, success = false;
+            if (e.field.name == 'participant') {
+                cutype = e.data && e.data.type == 'group' && e.result_type == 'person' ? 'GROUP' : 'INDIVIDUAL';
+                success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype: cutype });
             }
-        }
+            if (e.field && success) {
+                e.field.value = '';
+            }
+        });
 
-        if (list.rights && String(list.rights).indexOf(perm) >= 0) {
-            return true;
-        }
+        $('#edit-attendee-add').click(function() {
+            var input = $('#edit-attendee-name');
+            rcmail.ksearch_blur();
+            if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'INDIVIDUAL' })) {
+                input.val('');
+            }
+        });
 
-        return (perm == 'i' && list.editable);
+        // handle change of "send invitations" checkbox
+        $('#edit-attendees-invite').change(function() {
+            $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
+            // hide/show comment field
+            $('#taskeditform .attendees-commentbox')[this.checked ? 'show' : 'hide']();
+        });
+
+        // delegate change task to "send invitations" checkbox
+        $('#edit-attendees-donotify').change(function() {
+            $('#edit-attendees-invite').click();
+            return false;
+        });
+
+        // configure drop-down menu on time input fields based on jquery UI autocomplete
+        $('#taskedit-starttime, #taskedit-time').each(function() {
+            me.init_time_autocomplete(this, {container: '#taskedit'});
+        });
     }
 
     /**
@@ -796,6 +849,15 @@ function rcube_tasklist_ui(settings)
             $('#taskselector li.all').addClass('selected').attr('aria-checked', 'true');
     }
 
+    /**
+     * Filter tasks by tag
+     */
+    function filter_tasks(tags)
+    {
+        tagsfilter = tags;
+        list_tasks();
+    }
+
     /**
      * Remove all tasks of the given list from the UI
      */
@@ -814,6 +876,156 @@ function rcube_tasklist_ui(settings)
         loadstate.lists = active_lists();
     }
 
+    // open a dialog to upload an .ics file with tasks to be imported
+    this.import_tasks = function(tasklist)
+    {
+        // close show dialog first
+        var buttons = {},
+            $dialog = $("#tasksimport").clone(true).removeClass('uidialog'),
+            form = $dialog.find('form').get(0);
+
+        if ($dialog.is(':ui-dialog'))
+            $dialog.dialog('close');
+
+        if (tasklist)
+            $('#task-import-list').val(tasklist);
+
+        buttons[rcmail.gettext('import', 'tasklist')] = function() {
+            if (form && form.elements._data.value) {
+                rcmail.async_upload_form(form, 'import', function(e) {
+                    rcmail.set_busy(false, null, saving_lock);
+                    saving_lock = null;
+                    $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
+
+                    // display error message if no sophisticated response from server arrived (e.g. iframe load error)
+                    if (me.import_succeeded === null)
+                        rcmail.display_message(rcmail.get_label('importerror', 'tasklist'), 'error');
+                });
+
+                // display upload indicator (with extended timeout)
+                var timeout = rcmail.env.request_timeout;
+                rcmail.env.request_timeout = 600;
+                me.import_succeeded = null;
+                saving_lock = rcmail.set_busy(true, 'uploading');
+                $('.ui-dialog-buttonpane button', $dialog.parent()).button('disable');
+
+                // restore settings
+                rcmail.env.request_timeout = timeout;
+            }
+        };
+
+        buttons[rcmail.gettext('cancel', 'tasklist')] = function() {
+            $(this).dialog('close');
+        };
+
+        // open jquery UI dialog
+        this.import_dialog = rcmail.show_popup_dialog($dialog, rcmail.gettext('tasklist.importtasks'), buttons, {
+            closeOnEscape: false,
+            button_classes: ['import mainaction', 'cancel']
+        });
+    };
+
+    // callback from server if import succeeded
+    this.import_success = function(p)
+    {
+        this.import_succeeded = true;
+        this.import_dialog.dialog('close');
+        rcmail.set_busy(false, null, saving_lock);
+        saving_lock = null;
+        rcmail.gui_objects.importform.reset();
+
+        if (p.refetch) {
+            list_tasks(null, true);
+            setTimeout(fetch_counts, 200);
+        }
+    };
+
+    // callback from server to report errors on import
+    this.import_error = function(p)
+    {
+        this.import_succeeded = false;
+        rcmail.set_busy(false, null, saving_lock);
+        saving_lock = null;
+        rcmail.display_message(p.message || rcmail.get_label('importerror', 'tasklist'), 'error');
+    };
+
+    // open a tasks export dialog
+    this.export_tasks = function()
+    {
+        // close show dialog first
+        var $dialog = $("#tasksexport").clone(true).removeClass('uidialog'),
+            form = $dialog.find('form').get(0),
+            buttons = {};
+
+        if ($dialog.is(':ui-dialog'))
+            $dialog.dialog('close');
+
+        $("#task-export-list").val('');
+
+        buttons[rcmail.gettext('export', 'tasklist')] = function() {
+            var data = {},
+                source = $('#task-export-list').val(),
+                form_elements = $('select, input', form);
+
+            // "current view" export, use hidden form to POST task IDs
+            if (source === '') {
+                var cache = {}, tasks = [], inputs = [],
+                    postform = $('#tasks-export-form-post');
+
+                $.each(listindex || [], function() {
+                    var rec = listdata[this];
+                    if (match_filter(rec, cache)) {
+                        tasks.push(rec.id);
+                    }
+                });
+
+                // copy form inputs, there may be controls added by other plugins
+                form_elements.each(function() {
+                    if (this.type != 'checkbox' || this.checked)
+                        inputs.push($('<input>').attr({type: 'hidden', name: this.name, value: this.value}));
+                });
+
+                inputs.push($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
+                inputs.push($('<input>').attr({type: 'hidden', name: 'id', value: tasks.join(',')}));
+
+                if (!postform.length)
+                    postform = $('<form>')
+                        .attr({style: 'display: none', method: 'POST', action: '?_task=tasks&_action=export'})
+                        .appendTo('body');
+
+                postform.html('').append(inputs).submit();
+            }
+            // otherwise we can use simple GET
+            else {
+                form_elements.each(function() {
+                    if (this.type != 'checkbox' || this.checked)
+                        data[this.name] = $(this).val();
+                });
+
+                rcmail.goto_url('export', data, false);
+            }
+
+            $(this).dialog('close');
+        };
+
+        buttons[rcmail.gettext('cancel', 'tasklist')] = function() {
+            $(this).dialog('close');
+        };
+
+        // open jquery UI dialog
+        rcmail.show_popup_dialog($dialog, rcmail.gettext('exporttitle', 'tasklist'), buttons, {
+            button_classes: ['export mainaction', 'cancel']
+        });
+    };
+/*
+    // download the selected task as iCal
+    this.task_download = function(task)
+    {
+      if (task && task.id) {
+        rcmail.goto_url('export', {source: task.list, id: task.id, attachments: 1});
+      }
+    };
+*/
     /**
      * Modify query parameters for refresh requests
      */
@@ -851,7 +1063,7 @@ function rcube_tasklist_ui(settings)
         // sort index before rendering
         listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
 
-        append_tags(response.tags || []);
+        update_taglist(response.tags || []);
         render_tasklist();
 
         // show selected task dialog
@@ -881,7 +1093,10 @@ function rcube_tasklist_ui(settings)
             cache = {},
             activetags = {},
             msgbox = $('#listmessagebox').hide(),
-            list = $(rcmail.gui_objects.resultlist).html('');
+            list = $(rcmail.gui_objects.resultlist);
+            selected = $('.taskhead.selected', list).parent().attr('rel');
+
+        list.html('');
 
         for (var i=0; i < listindex.length; i++) {
             id = listindex[i];
@@ -909,12 +1124,16 @@ function rcube_tasklist_ui(settings)
             return;
 
         fix_tree_toggles();
-        update_tagcloud(activetags);
+        update_taglist();
 
         if (!count) {
             msgbox.html(rcmail.gettext('notasksfound','tasklist')).show();
             rcmail.display_message(rcmail.gettext('notasksfound','tasklist'), 'voice');
         }
+        else if (selected) {
+            // mark back the selected task
+            $('li[rel="' + selected + '"] > .taskhead').addClass('selected');
+        }
     }
 
     /**
@@ -928,7 +1147,7 @@ function rcube_tasklist_ui(settings)
                 childs = $('.childtasks li', li);
 
             $('.childtoggle', li)[(childs.length ? 'show' : 'hide')]();
-        })
+        });
     }
 
     /**
@@ -942,7 +1161,7 @@ function rcube_tasklist_ui(settings)
         $('.taskitem .childtoggle')
             .removeClass(collapsed ? 'expanded' : 'collapsed')
             .addClass(collapsed ? 'collapsed' : 'expanded')
-            .html(collapsed ? '&#9654;' : '&#9660;');
+            .html('').append($('<span class="inner">').text(collapsed ? '&#9654;' : '&#9660;'));
 
         // store new toggle collapse states
         var ids = [];
@@ -955,131 +1174,29 @@ function rcube_tasklist_ui(settings)
         }
     }
 
-    /**
-     *
-     */
-    function append_tags(taglist)
-    {
-        // find new tags
-        var newtags = [];
-        for (var i=0; i < taglist.length; i++) {
-            if ($.inArray(taglist[i], tags) < 0)
-                newtags.push(taglist[i]);
-        }
-        tags = tags.concat(newtags);
-
-        // append new tags to tag cloud
-        $.each(newtags, function(i, tag){
-            $('<li role="checkbox" aria-checked="false" tabindex="0"></li>')
-                .attr('rel', tag)
-                .data('value', tag)
-                .html(Q(tag) + '<span class="count"></span>')
-                .appendTo(rcmail.gui_objects.tagslist)
-                .draggable({
-                    addClasses: false,
-                    revert: 'invalid',
-                    revertDuration: 300,
-                    helper: tag_draggable_helper,
-                    start: tag_draggable_start,
-                    appendTo: 'body',
-                    cursor: 'pointer'
-                });
-            });
-
-        // re-sort tags list
-        $(rcmail.gui_objects.tagslist).children('li').sortElements(function(a,b){
-            return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1;
-        });
-    }
-
     /**
      * Display the given counts to each tag and set those inactive which don't
      * have any matching tasks in the current view.
      */
-    function update_tagcloud(counts)
+    function update_taglist(tags)
     {
-        // compute counts first by iterating over all visible task items
-        if (typeof counts == 'undefined') {
-            counts = {};
-            $('li.taskitem', rcmail.gui_objects.resultlist).each(function(i,li){
-                var t, id = $(li).attr('rel'),
-                    rec = listdata[id];
-                for (var j=0; rec && rec.tags && j < rec.tags.length; j++) {
-                    t = rec.tags[j];
-                    if (typeof counts[t] == 'undefined')
-                        counts[t] = 0;
-                    counts[t]++;
-                }
-            });
-        }
-
-        $(rcmail.gui_objects.tagslist).children('li').each(function(i,li){
-            var elem = $(li), tag = elem.attr('rel'),
-                count = counts[tag] || 0;
-
-            elem.children('.count').html(count+'');
-            if (count == 0) elem.addClass('inactive');
-            else            elem.removeClass('inactive');
+        var counts = {};
+        $.each(listdata, function(id, rec) {
+            for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
+                t = rec.tags[j];
+                if (typeof counts[t] == 'undefined')
+                    counts[t] = 0;
+                counts[t]++;
+            }
         });
-    }
 
-    /*  Helper functions for drag & drop functionality of tags  */
-    
-    function tag_draggable_helper()
-    {
-        if (!tag_draghelper)
-            tag_draghelper = $('<div class="tag-draghelper"></div>');
-        else
-            tag_draghelper.html('');
+        rcmail.triggerEvent('kolab-tags-counts', {counter: counts});
 
-        $(this).clone().addClass('tag').appendTo(tag_draghelper);
-        return tag_draghelper;
-    }
-
-    function tag_draggable_start(event, ui)
-    {
-        $('.taskhead').droppable({
-            hoverClass: 'droptarget',
-            accept: tag_droppable_accept,
-            drop: tag_draggable_dropped,
-            addClasses: false
-        });
-    }
-
-    function tag_droppable_accept(draggable)
-    {
-        if (rcmail.busy)
-            return false;
-
-        var tag = draggable.data('value'),
-            drop_id = $(this).data('id'),
-            drop_rec = listdata[drop_id],
-            list = drop_rec && me.tasklists[drop_rec.list] ? me.tasklists[drop_rec.list] : { editable:true };
-
-        // target is not editable or already has this tag assigned
-        if (!drop_rec || drop_rec.readonly || !has_permission(list, 'i') || (drop_rec.tags && $.inArray(tag, drop_rec.tags) >= 0)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    function tag_draggable_dropped(event, ui)
-    {
-        var drop_id = $(this).data('id'),
-            tag = ui.draggable.data('value'),
-            rec = listdata[drop_id];
-
-        if (rec && rec.id) {
-            if (!rec.tags) rec.tags = [];
-            rec.tags.push(tag);
-            save_task(rec, 'edit');
+        if (tags && tags.length) {
+            rcmail.triggerEvent('kolab-tags-refresh', {tags: tags});
         }
     }
 
-    /**
-     *
-     */
     function update_counts(counts)
     {
         // got new data
@@ -1089,9 +1206,9 @@ function rcube_tasklist_ui(settings)
         // iterate over all selector links and update counts
         $('#taskselector a').each(function(i, elem){
             var link = $(elem),
-                f = link.parent().attr('class').replace(/\s\w+/, '');
+                f = link.parent().attr('class').replace(/\s\w+/g, '');
             if (f != 'all')
-                link.children('span').html(taskcounts[f] || '')[(taskcounts[f] ? 'show' : 'hide')]();
+                link.children('span').html('+' + (taskcounts[f] || ''))[(taskcounts[f] ? 'show' : 'hide')]();
         });
 
         // spacial case: overdue
@@ -1116,6 +1233,9 @@ function rcube_tasklist_ui(settings)
             oldparent = oldrec ? (oldrec._old_parent_id || oldrec.parent_id) : null,
             list = me.tasklists[rec.list];
 
+        if (!id || !list)
+            return;
+
         if (oldindex >= 0)
             listindex[oldindex] = id;
         else
@@ -1161,8 +1281,7 @@ function rcube_tasklist_ui(settings)
             $('li[rel="'+id+'"]', rcmail.gui_objects.resultlist).remove();
         }
 
-        append_tags(rec.tags || []);
-        update_tagcloud();
+        update_taglist(rec.tags || []);
         fix_tree_toggles();
 
         // refresh currently displayed task details dialog
@@ -1177,7 +1296,7 @@ function rcube_tasklist_ui(settings)
     function save_task(rec, action)
     {
         // show confirmation dialog when status of an assigned task has changed
-        if (rec._status_before !== undefined && is_attendee(rec))
+        if (rec._status_before !== undefined && me.is_attendee(rec))
             return save_task_confirm(rec, action);
 
         if (!rcmail.busy) {
@@ -1186,7 +1305,7 @@ function rcube_tasklist_ui(settings)
             $('button.ui-button:ui-button').button('option', 'disabled', rcmail.busy);
             return true;
         }
-        
+
         return false;
     }
 
@@ -1196,11 +1315,11 @@ function rcube_tasklist_ui(settings)
     var save_task_confirm = function(rec, action, updates)
     {
         var data = $.extend({}, rec, updates || {}),
-          notify = false, partstat = false, html = '',
-          do_confirm = settings.itip_notify & 2;
+            notify = false, partstat = false, html = '',
+            do_confirm = settings.itip_notify & 2;
 
         // task has attendees, ask whether to notify them
-        if (has_attendees(rec) && is_organizer(rec)) {
+        if (me.has_attendees(rec) && me.is_organizer(rec)) {
             notify = true;
             if (do_confirm) {
                 html = rcmail.gettext('changeconfirmnotifications', 'tasklist');
@@ -1210,14 +1329,14 @@ function rcube_tasklist_ui(settings)
             }
         }
         // ask whether to change my partstat and notify organizer
-        else if (data._status_before !== undefined && data.status && data._status_before != data.status && is_attendee(rec)) {
-          partstat = true;
-          if (do_confirm) {
-              html = rcmail.gettext('partstatupdatenotification', 'tasklist');
-          }
-          else if (settings.itip_notify & 1) {
-              data._reportpartstat = data.status == 'CANCELLED' ? 'DECLINED' : data.status;
-          }
+        else if (data._status_before !== undefined && data.status && data._status_before != data.status && me.is_attendee(rec)) {
+            partstat = true;
+            if (do_confirm) {
+                html = rcmail.gettext('partstatupdatenotification', 'tasklist');
+            }
+            else if (settings.itip_notify & 1) {
+                data._reportpartstat = data.status == 'CANCELLED' ? 'DECLINED' : data.status;
+            }
         }
 
         // remove to avoid endless recursion
@@ -1230,6 +1349,7 @@ function rcube_tasklist_ui(settings)
             var buttons = [];
             buttons.push({
                 text: rcmail.gettext('saveandnotify', 'tasklist'),
+                'class': 'mainaction save notify',
                 click: function() {
                     if (notify)   data._notify = 1;
                     if (partstat) data._reportpartstat = data.status == 'CANCELLED' ? 'DECLINED' : data.status;
@@ -1239,6 +1359,7 @@ function rcube_tasklist_ui(settings)
             });
             buttons.push({
                 text: rcmail.gettext('save', 'tasklist'),
+                'class': 'save',
                 click: function() {
                     save_task(data, action);
                     $(this).dialog('close');
@@ -1246,10 +1367,11 @@ function rcube_tasklist_ui(settings)
             });
             buttons.push({
                 text: rcmail.gettext('cancel', 'tasklist'),
+                'class': 'cancel',
                 click: function() {
                     $(this).dialog('close');
                     if (updates)
-                      render_task(rec, rec.id);  // restore previous state
+                        render_task(rec, rec.id);  // restore previous state
                 }
             });
 
@@ -1285,6 +1407,13 @@ function rcube_tasklist_ui(settings)
         if (saving_lock) {
             rcmail.set_busy(false, null, saving_lock);
             $('button.ui-button:ui-button').button('option', 'disabled', false);
+            saving_lock = null;
+
+            // Elastic
+            if (!$('.selected', rcmail.gui_objects.resultlist).length) {
+                $('#taskedit').parents('.watermark').removeClass('formcontainer');
+                rcmail.triggerEvent('show-list', {force: true});
+            }
         }
     }
 
@@ -1293,17 +1422,13 @@ function rcube_tasklist_ui(settings)
      */
     function render_task(rec, replace)
     {
-        var tags_html = '';
-        for (var j=0; rec.tags && j < rec.tags.length; j++)
-            tags_html += '<span class="tag">' + Q(rec.tags[j]) + '</span>';
-
         var label_id = rcmail.html_identifier(rec.id) + '-title';
         var div = $('<div>').addClass('taskhead').html(
             '<div class="progressbar"><div class="progressvalue" style="width:' + (rec.complete * 100) + '%"></div></div>' +
             '<input type="checkbox" name="completed[]" value="1" class="complete" aria-label="' + rcmail.gettext('complete','tasklist') + '" ' + (is_complete(rec) ? 'checked="checked" ' : '') + '/>' + 
             '<span class="flagged" role="checkbox" tabindex="0" aria-checked="' + (rec.flagged ? 'true' : 'false') + '" aria-label="' + rcmail.gettext('flagged','tasklist') + '"></span>' +
             '<span class="title" id="' + label_id + '">' + text2html(Q(rec.title)) + '</span>' +
-            '<span class="tags">' + tags_html + '</span>' +
+            '<span class="tags"></span>' +
             '<span class="date">' + Q(rec.date || rcmail.gettext('nodate','tasklist')) + '</span>' +
             '<a href="#" class="actions" aria-haspopup="true" aria-expanded="false">' + rcmail.gettext('taskactions','tasklist') + '</a>'
             )
@@ -1322,6 +1447,14 @@ function rcube_tasklist_ui(settings)
                 revertDuration: 300
             });
 
+        if (window.kolab_tags_text_block) {
+            var tags = rec.tags || [];
+
+            if (tags.length) {
+                window.kolab_tags_text_block(tags, $('.tags', div));
+            }
+        }
+
         if (is_complete(rec))
             div.addClass('complete');
         if (rec.flagged)
@@ -1341,7 +1474,7 @@ function rcube_tasklist_ui(settings)
             li = $('<li role="treeitem">')
                 .attr('rel', rec.id)
                 .addClass('taskitem')
-                .append((rec.collapsed ? '<span class="childtoggle collapsed">&#9654;' : '<span class="childtoggle expanded">&#9660;') + '</span>')
+                .append((rec.collapsed ? '<span class="childtoggle collapsed"><span class="inner">&#9654;' : '<span class="childtoggle expanded"><span class="inner">&#9660;') + '</span></span>')
                 .append(div)
                 .append('<ul class="childtasks" role="group" style="' + (rec.collapsed ? 'display:none' : '') + '" aria-hidden="' + (rec.collapsed ? 'true' : 'false') +'"></ul>');
 
@@ -1352,6 +1485,8 @@ function rcube_tasklist_ui(settings)
         if (!inplace && parent && parent.length)
             li.appendTo(parent);
 
+        rcmail.triggerEvent('tasks-insertrow', {div: div});
+
         if (replace) {
             resort_task(rec, li, true);
             // TODO: remove the item after a while if it doesn't match the current filter anymore
@@ -1543,11 +1678,15 @@ function rcube_tasklist_ui(settings)
 
 
     /*  Helper functions for drag & drop functionality  */
-    
-    function task_draggable_helper()
+
+    function task_draggable_helper(e)
     {
         if (!task_draghelper)
-            task_draghelper = $('<div class="taskitem-draghelper">&#x2714;</div>');
+            task_draghelper = $('<div id="rcmdraglayer" class="taskitem-draghelper">');
+
+        var title = $(e.target).parents('li').first().find('.title:first').text();
+
+        task_draghelper.html(Q(title) || '&#x2714');
 
         return task_draghelper;
     }
@@ -1558,6 +1697,7 @@ function rcube_tasklist_ui(settings)
             hoverClass: 'droptarget',
             accept: task_droppable_accept,
             drop: task_draggable_dropped,
+            tolerance: 'pointer',
             addClasses: false
         };
 
@@ -1691,29 +1831,8 @@ function rcube_tasklist_ui(settings)
             scroll_timer = window.setTimeout(function(){ tasklist_drag_scroll(container, dir); }, scroll_speed);
     }
 
-    // check if the task has 'real' attendees, excluding the current user
-    var has_attendees = function(task)
-    {
-        return !!(task.attendees && task.attendees.length && (task.attendees.length > 1 || String(task.attendees[0].email).toLowerCase() != settings.identity.email));
-    };
-
-    // check if the current user is an attendee of this task
-    var is_attendee = function(task, email, role)
-    {
-        var i, attendee, emails = email ? ';' + email.toLowerCase() : settings.identity.emails;
-
-        for (i=0; task.attendees && i < task.attendees.length; i++) {
-            attendee = task.attendees[i];
-            if ((!role || attendee.role == role) && attendee.email && emails.indexOf(';'+attendee.email.toLowerCase()) >= 0) {
-                return attendee;
-            }
-        }
-
-        return false;
-    };
-
     // check if the current user is the organizer
-    var is_organizer = function(task, email)
+    this.is_organizer = function(task, email)
     {
         if (!email) email = task.organizer ? task.organizer.email : null;
         if (email)
@@ -1754,7 +1873,7 @@ function rcube_tasklist_ui(settings)
                 success = true;
             }
             else {
-                alert(rcmail.gettext('noemailwarning'));
+                rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
             }
         }
 
@@ -1774,31 +1893,35 @@ function rcube_tasklist_ui(settings)
             return false;
 
         var dispname = Q(data.name || data.email);
-        if (data.email)
-            dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
+        dispname = '<span' + ((data.email && data.email != dispname) ? ' title="' + Q(data.email) + '"' : '') + '>' + dispname + '</span>';
 
         // delete icon
-        var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
-        var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
-        var tooltip = data.status || '';
+        var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : '<span class="inner">' + Q(rcmail.gettext('delete')) + '</span>';
+        var dellink = '<a href="#delete" class="iconlink icon button delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
+        var tooltip, status = (data.status || '').toLowerCase(),
+            status_label = rcmail.gettext('status' + status, 'libcalendaring');
 
         // send invitation checkbox
         var invbox = '<input type="checkbox" class="edit-attendee-reply" value="' + Q(data.email) +'" title="' + Q(rcmail.gettext('tasklist.sendinvitations')) + '" '
             + (!data.noreply && settings.itip_notify & 1 ? 'checked="checked" ' : '') + '/>';
 
         if (data['delegated-to'])
-            tooltip = rcmail.gettext('delegatedto', 'tasklist') + data['delegated-to'];
+            tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
         else if (data['delegated-from'])
-            tooltip = rcmail.gettext('delegatedfrom', 'tasklist') + data['delegated-from'];
+            tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
+        else if (status)
+            tooltip = status_label;
 
         // add expand button for groups
         if (data.cutype == 'GROUP') {
-            dispname += ' <a href="#expand" data-email="' + Q(data.email) + '" class="iconbutton add expandlink" title="' + rcmail.gettext('expandattendeegroup','libcalendaring') + '">' +
-                rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>';
+            dispname += ' <a href="#expand" data-email="' + Q(data.email)
+                + '" class="iconbutton add icon button expandlink" title="' + rcmail.gettext('expandattendeegroup','libcalendaring') + '">'
+                + '<span class="inner">' + rcmail.gettext('expandattendeegroup','libcalendaring') + '</span></a>';
         }
 
+        var elastic = $(attendees_list).parents('.no-img').length > 0;
         var html = '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
-            '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
+            '<td class="confirmstate"><span class="attendee ' + status + '" title="' + Q(tooltip) + '">' + Q(status && !elastic ? status_label : '') + '</span></td>' +
             (data.cutype != 'RESOURCE' ? '<td class="invite">' + (readonly || !invbox ? '' : invbox) + '</td>' : '') +
             '<td class="options">' + (readonly ? '' : dellink) + '</td>';
 
@@ -1812,13 +1935,16 @@ function rcube_tasklist_ui(settings)
             tr.appendTo(attendees_list);
 
         tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; });
-        tr.find('a.mailtolink').click(task_attendee_click);
         tr.find('a.expandlink').click(data, function(e) { me.expand_attendee_group(e, add_attendee, remove_attendee); return false; });
         tr.find('input.edit-attendee-reply').click(function() {
             var enabled = $('#edit-attendees-invite:checked').length || $('input.edit-attendee-reply:checked').length;
             $('#taskeditform .attendees-commentbox')[enabled ? 'show' : 'hide']();
         });
 
+        // Make Elastic checkboxes pretty
+        if (window.UI && UI.pretty_checkbox)
+            $(tr).find('input[type=checkbox]').each(function() { UI.pretty_checkbox(this); });
+
         task_attendees.push(data);
         return true;
     };
@@ -1844,10 +1970,16 @@ function rcube_tasklist_ui(settings)
      */
     function task_show_dialog(id, data, temp)
     {
-        var $dialog = $('#taskshow'), rec, list;
+        var rec, list, elastic = false, $dialog = $('#taskshow');
+        if ($dialog.data('nodialog')) {
+            elastic = true;
+            $('#taskedit').addClass('hidden').parent().addClass('watermark'); // Elastic
+        }
+        else {
+            $dialog.filter(':ui-dialog').dialog('close');
+        }
 
-        if ($dialog.is(':ui-dialog'))
-          $dialog.dialog('close');
+        rcmail.enable_command('edit-task', 'delete-task', 'save-task', 'task-history', false);
 
         // remove status-* classes
         $dialog.removeClass(function(i, oldclass) {
@@ -1861,38 +1993,43 @@ function rcube_tasklist_ui(settings)
         me.selected_task = rec;
         list = rec.list && me.tasklists[rec.list] ? me.tasklists[rec.list] : {};
 
+        // hide nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > .disabled').hide();
+
+        // for Elastic
+        rcmail.triggerEvent('show-content', {
+            mode: 'info',
+            title: rcmail.gettext('taskdetails', 'tasklist'),
+            obj: $('#taskshow').parent(),
+            scrollElement: $('#taskshow')
+        });
+
+        var status = rcmail.gettext('status-' + String(rec.status).toLowerCase(),'tasklist');
+
         // fill dialog data
         $('#task-parent-title').html(Q(rec.parent_title || '')+' &raquo;').css('display', rec.parent_title ? 'block' : 'none');
         $('#task-title').html(text2html(Q(rec.title || '')));
         $('#task-description').html(text2html(rec.description || '', 300, 6))[(rec.description ? 'show' : 'hide')]();
-        $('#task-date')[(rec.date ? 'show' : 'hide')]().children('.task-text').html(Q(rec.date || rcmail.gettext('nodate','tasklist')));
-        $('#task-time').html(Q(rec.time || ''));
-        $('#task-start')[(rec.startdate ? 'show' : 'hide')]().children('.task-text').html(Q(rec.startdate || ''));
-        $('#task-starttime').html(Q(rec.starttime || ''));
+        $('#task-date')[(rec.date ? 'show' : 'hide')]().find('.task-text').text(rec.date || rcmail.gettext('nodate','tasklist'));
+        $('#task-time').text(rec.time || '');
+        $('#task-start')[(rec.startdate ? 'show' : 'hide')]().find('.task-text').text(rec.startdate || '');
+        $('#task-starttime').text(rec.starttime || '');
         $('#task-alarm')[(rec.alarms_text ? 'show' : 'hide')]().children('.task-text').html(Q(rec.alarms_text));
         $('#task-completeness .task-text').html(((rec.complete || 0) * 100) + '%');
-        $('#task-status')[(rec.status ? 'show' : 'hide')]().children('.task-text').html(rcmail.gettext('status-'+String(rec.status).toLowerCase(),'tasklist'));
+        $('#task-status')[(rec.status ? 'show' : 'hide')]().children('.task-text').text(status);
         $('#task-list .task-text').html(Q(me.tasklists[rec.list] ? me.tasklists[rec.list].name : ''));
-        $('#task-attendees, #task-organizer, #task-created-changed, #task-rsvp, #task-rsvp-comment').hide();
+        $('#task-attendees, #task-organizer, #task-created-changed, #task-created, #task-changed, #task-rsvp, #task-rsvp-comment').hide();
 
-        var itags = get_inherited_tags(rec);
-        var taglist = $('#task-tags')[(rec.tags && rec.tags.length || itags.length ? 'show' : 'hide')]().children('.task-text').empty();
-        if (rec.tags && rec.tags.length) {
-            $.each(rec.tags, function(i,val){
-                $('<span>').addClass('tag-element').html(Q(val)).appendTo(taglist);
-            });
-        }
+        $('#event-status-badge > span').text(status);
 
-        // append inherited tags
-        if (itags.length) {
-            $.each(itags, function(i,val){
-                if (!rec.tags || $.inArray(val, rec.tags) < 0)
-                    $('<span>').addClass('tag-element inherit').html(Q(val)).appendTo(taglist);
-            });
-            // re-sort tags list
-            $(taglist).children().sortElements(function(a,b){
-                return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1;
-            });
+        // tags
+        var taglist = $('#task-tags').hide().children('.task-text').empty();
+        if (window.kolab_tags_text_block) {
+            var tags = $.uniqueStrings((rec.tags || []).concat(get_inherited_tags(rec)));
+            if (tags.length) {
+                window.kolab_tags_text_block(tags, taglist);
+                $('#task-tags').show();
+            }
         }
 
         if (rec.status) {
@@ -1911,9 +2048,9 @@ function rcube_tasklist_ui(settings)
         }
 
         if (rec.created || rec.changed) {
-            $('#task-created-changed .task-created').html(Q(rec.created_ || rcmail.gettext('unknown','tasklist')))
-            $('#task-created-changed .task-changed').html(Q(rec.changed_ || rcmail.gettext('unknown','tasklist')))
-            $('#task-created-changed').show()
+            $('.task-created', $dialog).text(rec.created_ || rcmail.gettext('unknown','tasklist'));
+            $('.task-changed', $dialog).text(rec.changed_ || rcmail.gettext('unknown','tasklist'));
+            $('#task-created-changed, #task-created, #task-changed').show();
         }
 
         // build attachments list
@@ -1943,7 +2080,7 @@ function rcube_tasklist_ui(settings)
             });
 */
             var j, data, rsvp = false, mystatus = null, line, morelink, html = '', overflow = '',
-                organizer = is_organizer(rec);
+                organizer = me.is_organizer(rec);
 
             for (j=0; j < rec.attendees.length; j++) {
                 data = rec.attendees[j];
@@ -1954,7 +2091,7 @@ function rcube_tasklist_ui(settings)
                         rsvp = mystatus;
                 }
 
-                line = task_attendee_html(data);
+                line = rcube_libcalendaring.attendee_html(data);
 
                 if (morelink)
                     overflow += line;
@@ -1994,10 +2131,10 @@ function rcube_tasklist_ui(settings)
                     .removeClass('accepted tentative declined delegated needs-action')
                     .addClass(mystatus)
                     .children('.task-text')
-                    .html(Q(rcmail.gettext('itip' + mystatus, 'libcalendaring')));
+                    .html(rcmail.gettext('status' + mystatus, 'libcalendaring'));
             }
 */
-            var show_rsvp = !temp && rsvp && list.editable && !is_organizer(rec) && rec.status != 'CANCELLED';
+            var show_rsvp = !temp && rsvp && list.editable && !me.is_organizer(rec) && rec.status != 'CANCELLED';
             $('#task-rsvp')[(show_rsvp ? 'show' : 'hide')]();
             $('#task-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
 
@@ -2008,14 +2145,15 @@ function rcube_tasklist_ui(settings)
             $('#task-rsvp .itip-reply-comment textarea').hide().val('');
 
             if (rec.organizer && !organizer) {
-                $('#task-organizer').show().children('.task-text').html(task_attendee_html($.extend(rec.organizer, { role:'ORGANIZER' })));
+                $('#task-organizer').show().children('.task-text').html(rcube_libcalendaring.attendee_html($.extend(rec.organizer, { role:'ORGANIZER' })));
             }
         }
 
         // define dialog buttons
         var buttons = [];
         if (list.editable && !rec.readonly) {
-              buttons.push({
+            rcmail.enable_command('edit-task', 'add-child-task', true);
+            buttons.push({
                 text: rcmail.gettext('edit','tasklist'),
                 click: function() {
                     task_edit_dialog(me.selected_task.id, 'edit');
@@ -2024,7 +2162,8 @@ function rcube_tasklist_ui(settings)
             });
         }
 
-        if (has_permission(list, 'td') && !rec.readonly) {
+        if (me.has_permission(list, 'td') && !rec.readonly) {
+            rcmail.enable_command('delete-task', true);
             buttons.push({
                 text: rcmail.gettext('delete','tasklist'),
                 'class': 'delete',
@@ -2036,50 +2175,43 @@ function rcube_tasklist_ui(settings)
             });
         }
 
-        // open jquery UI dialog
-        $dialog.dialog({
-          modal: false,
-          resizable: true,
-          closeOnEscape: true,
-          title: rcmail.gettext('taskdetails', 'tasklist'),
-          open: function() {
-              $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
-          },
-          close: function() {
-              $dialog.dialog('destroy').appendTo(document.body);
-              $('.libcal-rsvp-replymode').hide();
-          },
-          dragStart: function() {
-              $('.libcal-rsvp-replymode').hide();
-          },
-          resizeStart: function() {
-              $('.libcal-rsvp-replymode').hide();
-          },
-          buttons: buttons,
-          minWidth: 500,
-          width: 580
-        }).show();
+        rcmail.enable_command('task-history', !!list.history);
 
-        // set dialog size according to content
-        me.dialog_resize($dialog.get(0), $dialog.height(), 580);
-    }
+        if (!elastic) {
+            // open jquery UI dialog
+            $dialog.dialog({
+                modal: false,
+                resizable: true,
+                closeOnEscape: true,
+                title: rcmail.gettext('taskdetails', 'tasklist'),
+                open: function() {
+                    $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+                },
+                close: function() {
+                    $dialog.dialog('destroy').appendTo(document.body);
+                    $('.libcal-rsvp-replymode').hide();
+                },
+                dragStart: function() {
+                    $('.libcal-rsvp-replymode').hide();
+                },
+                resizeStart: function() {
+                    $('.libcal-rsvp-replymode').hide();
+                },
+                buttons: buttons,
+                minWidth: 500,
+                width: 580
+            }).show();
 
-    // render HTML code for displaying an attendee record
-    function task_attendee_html(data)
-    {
-        var dispname = Q(data.name || data.email), tooltip = '';
-
-        if (data.email) {
-          tooltip = data.email;
-          dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
+            // set dialog size according to content
+            me.dialog_resize($dialog.get(0), $dialog.height(), 580);
         }
 
-        if (data['delegated-to'])
-          tooltip = rcmail.gettext('delegatedto', 'tasklist') + data['delegated-to'];
-        else if (data['delegated-from'])
-          tooltip = rcmail.gettext('delegatedfrom', 'tasklist') + data['delegated-from'];
+        // Elastic
+        $dialog.removeClass('hidden').parents('.watermark').addClass('formcontainer');
+        $('#taskshow').parent().trigger('loaded');
 
-        return '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + dispname + '</span> ';
+        // hide nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > :not(.disabled)').show();
     }
 
     /**
@@ -2130,7 +2262,7 @@ function rcube_tasklist_ui(settings)
 
         if (data === false || !data.length || !rec) {
           // display 'unavailable' message
-          $('<div class="notfound-message task-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','tasklist') + '</div>')
+          $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','tasklist') + '</div>')
             .insertBefore($dialog.find('.changelog-table').hide());
           return;
         }
@@ -2186,8 +2318,8 @@ function rcube_tasklist_ui(settings)
               }
               // format attendees struct
               else if (prop == 'attendees') {
-                  if (change['old']) change.old_ = task_attendee_html(change['old']);
-                  if (change['new']) change.new_ = task_attendee_html($.extend({}, change['old'] || {}, change['new']));
+                  if (change['old']) change.old_ = rcube_libcalendaring.attendee_html(change['old']);
+                  if (change['new']) change.new_ = rcube_libcalendaring.attendee_html($.extend({}, change['old'] || {}, change['new']));
                   html = true;
               }
               // localize status
@@ -2269,17 +2401,43 @@ function rcube_tasklist_ui(settings)
      */
     function task_edit_dialog(id, action, presets)
     {
-        $('#taskshow:ui-dialog').dialog('close');
+        var elastic = false, infodialog = $('#taskshow');
+        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
+
+            elastic = true;
+            infodialog.addClass('hidden').parent().addClass('watermark'); // Elastic
+        }
+        else {
+            infodialog.filter(':ui-dialog').dialog('close');
+        }
+
+        rcmail.enable_command('edit-task', 'delete-task', 'add-child-task', 'save-task', 'task-history', false);
 
         var selected_list, rec = listdata[id] || presets,
             $dialog = $('<div>'),
             editform = $('#taskedit'),
+            readonly = rec && rec.readonly,
             list = rec.list && me.tasklists[rec.list] ? me.tasklists[rec.list] :
                 (me.selected_list ? me.tasklists[me.selected_list] : { editable: action == 'new', rights: action == 'new' ? 'rwitd' : 'r' });
 
-        if (rcmail.busy || !has_permission(list, 'i') || (action == 'edit' && (!rec || rec.readonly)))
+        if (rcmail.busy || !me.has_permission(list, 'i') || (action == 'edit' && (!rec || rec.readonly)))
             return false;
 
+        // hide nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > .disabled').hide();
+
+        if (action == 'new') {
+            $(rcmail.gui_objects.resultlist).find('.selected').removeClass('selected');
+        }
+
+        // for Elastic
+        rcmail.triggerEvent('show-content', {
+            mode: rec.uid ? 'edit' : 'add',
+            title: rcmail.gettext(rec.uid ? 'edittask' : 'newtask', 'tasklist'),
+            obj: $('#taskedit').parent(),
+            scrollElement: $('#taskedit')
+        });
+
         me.selected_task = $.extend({ valarms:[] }, rec);  // clone task object
         rec = me.selected_task;
 
@@ -2290,6 +2448,9 @@ function rcube_tasklist_ui(settings)
         // reset dialog first
         $('#taskeditform').get(0).reset();
 
+        // allow other plugins to do actions when task form is opened
+        rcmail.triggerEvent('tasklist-task-init', {o: rec});
+
         // fill form data
         var title = $('#taskedit-title').val(rec.title || '');
         var description = $('#taskedit-description').val(rec.description || '');
@@ -2304,14 +2465,15 @@ function rcube_tasklist_ui(settings)
         var notify = $('#edit-attendees-donotify').get(0);
         var invite = $('#edit-attendees-invite').get(0);
         var comment = $('#edit-attendees-comment');
+        var taglist;
 
         invite.checked = settings.itip_notify & 1 > 0;
-        notify.checked = has_attendees(rec) && invite.checked;
+        notify.checked = me.has_attendees(rec) && invite.checked;
 
         // set tasklist selection according to permissions
         tasklist.find('option').each(function(i, opt) {
             var l = me.tasklists[opt.value] || {},
-                writable = l.editable || (action == 'new' && has_permission(l, 'i'));
+                writable = l.editable || (action == 'new' && me.has_permission(l, 'i'));
             $(opt).prop('disabled', !writable);
 
             if (!selected_list && writable)
@@ -2321,23 +2483,10 @@ function rcube_tasklist_ui(settings)
         tasklist.val(rec.list || me.selected_list || selected_list);
 
         // tag-edit line
-        var tagline = $(rcmail.gui_objects.edittagline).empty();
-        $.each(typeof rec.tags == 'object' && rec.tags.length ? rec.tags : [''], function(i,val){
-            $('<input>')
-                .attr('name', 'tags[]')
-                .attr('tabindex', '0')
-                .addClass('tag')
-                .val(val)
-                .appendTo(tagline);
-        });
-
-        $('input.tag', rcmail.gui_objects.edittagline).tagedit({
-            animSpeed: 100,
-            allowEdit: false,
-            checkNewEntriesCaseSensitive: false,
-            autocompleteOptions: { source: tags, minLength: 0, noCheck: true, appendTo:'#taskedit' },
-            texts: { removeLinkTitle: rcmail.gettext('removetag', 'tasklist') }
-        });
+        if (window.kolab_tags_input) {
+            $('#taskedit-tagline').parent('.form-group').show();
+            taglist = kolab_tags_input($('#taskedit-tagline'), rec.tags, readonly);
+        }
 
         // set alarm(s)
         me.set_alarms_edit('#taskedit-alarms', action != 'new' && rec.valarms ? rec.valarms : []);
@@ -2354,13 +2503,13 @@ function rcube_tasklist_ui(settings)
         me.set_recurrence_edit(rec);
 
         // init attendees tab
-        var organizer = !rec.attendees || is_organizer(rec),
+        var organizer = !rec.attendees || me.is_organizer(rec),
             allow_invitations = organizer || (rec.owner && rec.owner == 'anonymous') || settings.invite_shared;
 
         task_attendees = [];
         attendees_list = $('#edit-attendees-table > tbody').html('');
-        $('#edit-attendees-notify')[(allow_invitations && has_attendees(rec) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
-        $('#edit-localchanges-warning')[(has_attendees(rec) && !(allow_invitations || (rec.owner && is_organizer(rec, rec.owner))) ? 'show' : 'hide')]();
+        $('#edit-attendees-notify')[(allow_invitations && me.has_attendees(rec) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
+        $('#edit-localchanges-warning')[(me.has_attendees(rec) && !(allow_invitations || (rec.owner && me.is_organizer(rec, rec.owner))) ? 'show' : 'hide')]();
 
         // attendees (aka assignees)
         if (list.attendees) {
@@ -2388,17 +2537,19 @@ function rcube_tasklist_ui(settings)
                 }
             });
 
-            $('#edit-tab-attendees').show();
+            $('#edit-tab-attendees').show(); // Larry
+            $('a[href="#taskedit-panel-attendees"]').parent().show(); // Elastic
             $('#edit-attendees-form')[(allow_invitations?'show':'hide')]();
             $('#edit-identities-list').val(identity_id);
             $('#taskedit-organizer')[(organizer ? 'show' : 'hide')]();
         }
         else {
-            $('#edit-tab-attendees').hide();
+            $('#edit-tab-attendees').hide(); // Larry
+            $('a[href="#taskedit-panel-attendees"]').parent().hide(); // Elastic
         }
 
         // attachments
-        rcmail.enable_command('remove-attachment', list.editable);
+        rcmail.enable_command('remove-attachment', 'upload-file', list.editable);
         me.selected_task.deleted_attachments = [];
         // we're sharing some code for uploads handling with app.js
         rcmail.env.attachments = [];
@@ -2412,17 +2563,16 @@ function rcube_tasklist_ui(settings)
         }
 
         // show/hide tabs according to calendar's feature support
-        $('#taskedit-tab-attachments')[(list.attachments||rec.attachments?'show':'hide')]();
+        $('#taskedit-tab-attachments')[(list.attachments||rec.attachments?'show':'hide')](); // Larry
+        $('a[href="#taskedit-panel-attachments"]').parent()[(list.attachments||rec.attachments?'show':'hide')](); // Elastic
 
         // activate the first tab
-        $('#taskedit').tabs('option', 'active', 0);
+        $('#taskedit:not([data-notabs])').tabs('option', 'active', 0); // Larry
+        if ($('#taskedit').data('notabs'))
+            $('#taskedit li.nav-item:first-child a').tab('show'); // Elastic
 
         // define dialog buttons
-        var buttons = [];
-        buttons.push({
-            text: rcmail.gettext('save', 'tasklist'),
-            'class': 'mainaction',
-            click: function() {
+        var buttons = [], save_func = function() {
             var data = me.selected_task;
             data._status_before = me.selected_task.status + '';
 
@@ -2430,8 +2580,9 @@ function rcube_tasklist_ui(settings)
             $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus }, function(key,input){
                 data[key] = input.val();
             });
+
             data.list = tasklist.find('option:selected').val();
-            data.tags = [];
+            data.tags = taglist ? kolab_tags_input_value(taglist) : [];
             data.attachments = [];
             data.attendees = task_attendees;
             data.valarms = me.serialize_alarms('#taskedit-alarms');
@@ -2446,30 +2597,19 @@ function rcube_tasklist_ui(settings)
                 var startdate = $.datepicker.parseDate(datepicker_settings.dateFormat, data.startdate, datepicker_settings);
                 var duedate = $.datepicker.parseDate(datepicker_settings.dateFormat, data.date, datepicker_settings);
                 if (startdate > duedate) {
-                    alert(rcmail.gettext('invalidstartduedates', 'tasklist'));
+                    rcmail.alert_dialog(rcmail.gettext('invalidstartduedates', 'tasklist'));
                     return false;
                 }
                 else if ((data.time == '') != (data.starttime == '')) {
-                    alert(rcmail.gettext('invalidstartduetimes', 'tasklist'));
+                    rcmail.alert_dialog(rcmail.gettext('invalidstartduetimes', 'tasklist'));
                     return false;
                 }
             }
             else if (data.recurrence && !data.startdate && !data.date) {
-                alert(rcmail.gettext('recurrencerequiresdate', 'tasklist'));
+                rcmail.alert_dialog(rcmail.gettext('recurrencerequiresdate', 'tasklist'));
                 return false;
             }
 
-            // collect tags
-            $('input[type="hidden"]', rcmail.gui_objects.edittagline).each(function(i,elem) {
-                if (elem.value)
-                    data.tags.push(elem.value);
-            });
-            // including the "pending" one in the text box
-            var newtag = $('#tagedit-input').val();
-            if (newtag != '') {
-                data.tags.push(newtag);
-            }
-
             // uploaded attachments list
             for (var i in rcmail.env.attachments) {
                 if (i.match(/^rcmfile(.+)/))
@@ -2515,7 +2655,7 @@ function rcube_tasklist_ui(settings)
             }
 
             // tell server to send notifications
-            if ((data.attendees.length || (rec.id && rec.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
+            if ((me.has_attendees(data) || (rec.id && me.has_attendees(rec))) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
                 data._notify = settings.itip_notify;
                 data._comment = comment.val();
             }
@@ -2523,12 +2663,21 @@ function rcube_tasklist_ui(settings)
                 delete data._notify;
             }
 
-            if (save_task(data, action))
+            if (save_task(data, action) && !elastic)
                 $dialog.dialog('close');
-        }  // end click:
+        };
+
+        rcmail.enable_command('save-task', true);
+        rcmail.env.task_save_func = save_func;
+
+        buttons.push({
+            text: rcmail.gettext('save', 'tasklist'),
+            'class': 'mainaction',
+            click: save_func
         });
 
         if (action != 'new') {
+            rcmail.enable_command('delete-task', true);
             buttons.push({
                 text: rcmail.gettext('delete', 'tasklist'),
                 'class': 'delete',
@@ -2547,117 +2696,73 @@ function rcube_tasklist_ui(settings)
         });
 
         // open jquery UI dialog
-        $dialog.dialog({
-          modal: true,
-          resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
-          closeOnEscape: false,
-          title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
-          close: function() {
-              rcmail.ksearch_blur();
-              editform.hide().appendTo(document.body);
-              $dialog.dialog('destroy').remove();
-          },
-          buttons: buttons,
-          minHeight: 460,
-          minWidth: 500,
-          width: 580
-        }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE
+        if (!elastic) {
+            $dialog.dialog({
+                modal: true,
+                resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
+                closeOnEscape: false,
+                title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
+                close: function() {
+                    rcmail.ksearch_blur();
+                    editform.hide().appendTo(document.body);
+                    $dialog.dialog('destroy').remove();
+                },
+                buttons: buttons,
+                minHeight: 460,
+                minWidth: 500,
+                width: 580
+            }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE
+
+            // set dialog size according to content
+            me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+        }
+
+        // Elastic
+        editform.removeClass('hidden').parents('.watermark').addClass('formcontainer');
+        $('#taskedit').parent().trigger('loaded');
 
         title.select();
 
-        // set dialog size according to content
-        me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+        // show nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > :not(.disabled)').show();
     }
 
     /**
      * Open a task attachment either in a browser window for inline view or download it
      */
-    function load_attachment(rec, att)
+    function load_attachment(data)
     {
+        var rec = data.record;
+
         // can't open temp attachments
         if (!rec.id || rec.id < 0)
             return false;
 
-        var query = { _id: att.id, _t: rec.recurrence_id||rec.id, _list:rec.list, _frame: 1 };
+        var query = {_id: data.attachment.id, _t: rec.recurrence_id || rec.id, _list: rec.list};
+
         if (rec.rev)
             query._rev = rec.rev;
 
-
-        // open attachment in frame if it's of a supported mimetype
-        // similar as in app.js and calendar_ui.js
-        if (att.id && att.mimetype && $.inArray(att.mimetype, settings.mimetypes)>=0) {
-            if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
-                return;
-            }
-        }
-
-        query._frame = null;
-        query._download = 1;
-        rcmail.goto_url('get-attachment', query, false);
+        libkolab.load_attachment(query, data.attachment);
     };
 
     /**
      * Build task attachments list
      */
-    function task_show_attachments(list, container, rec, edit)
+    function task_show_attachments(list, container, task, edit)
     {
-        var i, id, len, content, li, elem,
-            ul = $('<ul>').addClass('attachmentslist');
-
-        for (i=0, len=list.length; i<len; i++) {
-            elem = list[i];
-            li = $('<li>').addClass(elem.classname);
-
-            if (edit) {
-                rcmail.env.attachments[elem.id] = elem;
-                // delete icon
-                content = $('<a>')
-                    .attr('href', '#delete')
-                    .attr('title', rcmail.gettext('delete'))
-                    .addClass('delete')
-                    .click({ id:elem.id }, function(e) {
-                        remove_attachment(this, e.data.id);
-                        return false;
-                    });
-
-                if (!rcmail.env.deleteicon) {
-                    content.html(rcmail.gettext('delete'));
-                }
-                else {
-                    $('<img>').attr('src', rcmail.env.deleteicon).attr('alt', rcmail.gettext('delete')).appendTo(content);
-                }
-
-                li.append(content);
-            }
-
-            // name/link
-            $('<a>')
-                .attr('href', '#load')
-                .addClass('file')
-                .html(elem.name).click({ task:rec, att:elem }, function(e) {
-                    load_attachment(e.data.task, e.data.att);
-                    return false;
-                }).appendTo(li);
-
-            ul.append(li);
-        }
-
-        if (edit && rcmail.gui_objects.attachmentlist) {
-            ul.id = rcmail.gui_objects.attachmentlist.id;
-            rcmail.gui_objects.attachmentlist = ul.get(0);
-        }
-
-        container.empty().append(ul);
+      libkolab.list_attachments(list, container, edit, task,
+        function(id) { remove_attachment(id); },
+        function(data) { load_attachment(data); }
+      );
     };
 
     /**
      *
      */
-    function remove_attachment(elem, id)
+    function remove_attachment(id)
     {
-        $(elem.parentNode).hide();
         me.selected_task.deleted_attachments.push(id);
-        delete rcmail.env.attachments[id];
     }
 
     /**
@@ -2728,6 +2833,7 @@ function rcube_tasklist_ui(settings)
             html = rcmail.gettext('deleteparenttasktconfirm','tasklist');
             buttons.push({
                 text: rcmail.gettext('deletethisonly','tasklist'),
+                'class': 'delete',
                 click: function() {
                     _delete_task(id, 0);
                     $(this).dialog('close');
@@ -2735,6 +2841,7 @@ function rcube_tasklist_ui(settings)
             });
             buttons.push({
                 text: rcmail.gettext('deletewithchilds','tasklist'),
+                'class': 'delete',
                 click: function() {
                     _delete_task(id, 1);
                     $(this).dialog('close');
@@ -2753,21 +2860,22 @@ function rcube_tasklist_ui(settings)
             });
         }
 
-        if (is_attendee(rec)) {
-            html += '<div class="task-dialog-message">' +
-                '<label><input class="confirm-attendees-decline" type="checkbox" checked="checked" value="1" name="_decline" />&nbsp;' +
+        if (me.is_attendee(rec)) {
+            html += '<div class="dialog-message">' +
+                '<label><input class="confirm-attendees-decline pretty-checkbox" type="checkbox" checked="checked" value="1" name="_decline" />&nbsp;' +
                     rcmail.gettext('itipdeclinetask', 'tasklist') + 
                 '</label></div>';
         }
-        else if (has_attendees(rec) && is_organizer(rec)) {
-            html += '<div class="task-dialog-message">' +
-                '<label><input class="confirm-attendees-notify" type="checkbox" checked="checked" value="1" name="_notify" />&nbsp;' +
+        else if (me.has_attendees(rec) && me.is_organizer(rec)) {
+            html += '<div class="dialog-message">' +
+                '<label><input class="confirm-attendees-notify pretty-checkbox" type="checkbox" checked="checked" value="1" name="_notify" />&nbsp;' +
                     rcmail.gettext('sendcancellation', 'tasklist') + 
                 '</label></div>';
         }
 
         buttons.push({
             text: rcmail.gettext('cancel', 'tasklist'),
+            'class': 'cancel',
             click: function() {
                 $(this).dialog('close');
             }
@@ -2853,7 +2961,7 @@ function rcube_tasklist_ui(settings)
             }
         }
 
-        return $.unqiqueStrings(itags);
+        return $.uniqueStrings(itags);
     }
 
     /**
@@ -2861,20 +2969,7 @@ function rcube_tasklist_ui(settings)
      */
     function list_set_sort(col)
     {
-        if (settings.sort_col != col) {
-          settings.sort_col = col;
-          $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
-              .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
-
-          // re-sort list index and re-render list
-          listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
-          render_tasklist();
-
-          rcmail.enable_command('list-order', settings.sort_col != 'auto');
-          $('#taskviewsortmenu .sortorder').removeClass('selected').filter('[aria-checked=true]').addClass('selected');
-
-          rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
-        }
+        list_set_sort_and_order(col, settings.sort_order);
     }
 
     /**
@@ -2882,108 +2977,95 @@ function rcube_tasklist_ui(settings)
      */
     function list_set_order(order)
     {
-        if (settings.sort_order != order) {
-          settings.sort_order = order;
-          $('#taskviewsortmenu .sortorder').attr('aria-checked', 'false').removeClass('selected')
-              .filter('.' + order).attr('aria-checked', 'true').addClass('selected');
-
-          // re-sort list index and re-render list
-          listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
-          render_tasklist();
-
-          rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
-        }
+        list_set_sort_and_order(settings.sort_col, order);
     }
 
     /**
-     *
+     * Change tasks list sorting and/or order
+     */
+    function list_set_sort_and_order(col, order)
+    {
+        var col_change = settings.sort_col != col,
+            ord_change = settings.sort_order != order;
+
+        if (col_change || ord_change) {
+            settings.sort_col = col;
+            settings.sort_order = order;
+
+            // re-sort list index and re-render list
+            listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
+            render_tasklist();
+
+            rcmail.enable_command('list-order', settings.sort_col != 'auto');
+
+            if (col_change)
+                rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
+
+            if (ord_change)
+                rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
+
+            $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
+                .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
+            $('#taskviewsortmenu .sortorder').removeClass('selected')
+                .filter('[aria-checked=true]').addClass('selected');
+        }
+    }
+
+    function get_setting(name)
+    {
+        return settings[name];
+    }
+
+    /**
+     * Dialog for tasks list creation/update
      */
     function list_edit_dialog(id)
     {
-        var list = me.tasklists[id],
-            $dialog = $(rcmail.gui_containers.tasklistform);
+        var list = me.tasklists[id] || {name: '', editable: true, rights: 'riwta', showalarms: true},
+            title = rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
+            params = {action: (list.id ? 'form-edit' : 'form-new'), l: { id:list.id }, _framed: 1},
+            $dialog = $('<iframe>').attr('src', rcmail.url('tasklist', params)).on('load', function() {
+                $(this).contents().find('#taskedit-showalarms')
+                    .prop('checked', list.showalarms);
+                $(this).contents().find('#taskedit-tasklistname')
+                    .prop('disabled', !me.has_permission(list, 'a') || list.norename)
+                    .val(list.editname || list.name)
+                    .select();
+            }),
+            save_func = function() {
+                var data,
+                    form = $dialog.contents().find('#tasklisteditform'),
+                    name = form.find('#taskedit-tasklistname');
 
-        if ($dialog.is(':ui-dialog'))
-            $dialog.dialog('close');
-
-        if (!list)
-            list = { name:'', editable:true, rights:'riwta', showalarms:true };
-
-        var editform, name, alarms;
-
-        $dialog.html(rcmail.get_label('loading'));
-        $.ajax({
-            type: 'GET',
-            dataType: 'html',
-            url: rcmail.url('tasklist'),
-            data: { action:(list.id ? 'form-edit' : 'form-new'), l:{ id:list.id } },
-            success: function(data) {
-                $dialog.html(data);
-                rcmail.triggerEvent('tasklist_editform_load', list);
-
-                // resize and reposition dialog window
-                editform = $('#tasklisteditform');
-                me.dialog_resize(rcmail.gui_containers.tasklistform, editform.height(), editform.width());
-
-                name = $('#taskedit-tasklistame').prop('disabled', !has_permission(list, 'a')||list.norename).val(list.editname || list.name);
-                alarms = $('#taskedit-showalarms').prop('checked', list.showalarms).get(0);
-                name.select();
-
-                // suppress form submission with <Enter>
-                editform.on('submit', function(e) {
-                    e.preventDefault();
+                // form is not loaded
+                if (!form || !form.length)
                     return false;
-                });
-            }
+
+                // do some input validation
+                if (!name.val() || name.val().length < 2) {
+                    rcmail.alert_dialog(rcmail.gettext('invalidlistproperties', 'tasklist'), function() {
+                        name.select();
+                    });
+
+                    return false;
+                }
+
+                // post data to server
+                data = form.serializeJSON();
+                if (list.id)
+                    data.id = list.id;
+                if (form.find('#taskedit-tasklistname').is(':checked'))
+                    data.showalarms = 1;
+
+                saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
+                rcmail.http_post('tasklist', {action: (list.id ? 'edit' : 'new'), l: data});
+                return true;
+            };
+
+        rcmail.simple_dialog($dialog, title, save_func, {
+            width: 600,
+            height: 400
         });
-
-        // dialog buttons
-        var buttons = [];
-
-        buttons.push({
-            text: rcmail.gettext('save','tasklist'),
-            'class': 'mainaction',
-            click: function() {
-            // do some input validation
-            if (!name.val() || name.val().length < 2) {
-                alert(rcmail.gettext('invalidlistproperties', 'tasklist'));
-                name.select();
-                return;
-            }
-
-            // post data to server
-            var data = editform.serializeJSON();
-            if (list.id)
-                data.id = list.id;
-            if (alarms)
-                data.showalarms = alarms.checked ? 1 : 0;
-
-            saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
-            rcmail.http_post('tasklist', { action:(list.id ? 'edit' : 'new'), l:data });
-            $dialog.dialog('close');
-        }  // end click:
-        });
-
-        buttons.push({
-            text: rcmail.gettext('cancel','tasklist'),
-            click: function() {
-                $dialog.dialog('close');
-            }
-        });
-
-        // open jquery UI dialog
-        $dialog.dialog({
-            modal: true,
-            resizable: true,
-            closeOnEscape: false,
-            title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
-            close: function() {
-                $dialog.dialog('destroy').hide();
-            },
-            buttons: buttons,
-            minWidth: 400,
-            width: 420
-        }).show();
     }
 
     /**
@@ -2992,11 +3074,13 @@ function rcube_tasklist_ui(settings)
     function list_delete(id)
     {
         var list = me.tasklists[id];
-        if (list && !list.norename && confirm(rcmail.gettext(list.children ? 'deletelistconfirmrecursive' : 'deletelistconfirm', 'tasklist'))) {
-            saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
-            rcmail.http_post('tasklist', { action:'delete', l:{ id:list.id } });
-            return true;
+        if (list && !list.norename) {
+            rcmail.confirm_dialog(rcmail.gettext(list.children ? 'deletelistconfirmrecursive' : 'deletelistconfirm', 'tasklist'), 'delete', function() {
+                saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
+                rcmail.http_post('tasklist', { action:'delete', l:{ id:list.id } });
+            });
         }
+
         return false;
     }
 
@@ -3097,28 +3181,20 @@ function rcube_tasklist_ui(settings)
     }
 
     /**
-     *
+     * Display tasklist CalDAV URL dialog
      */
     function list_showurl(id)
     {
         var list = me.tasklists[id];
         if (list && list.caldavurl) {
-            $('div.showurldialog:ui-dialog').dialog('close');
+            var dialog = $('<div>').addClass('showurldialog').append('<p>'+rcmail.gettext('caldavurldescription', 'tasklist')+'</p>'),
+                textbox = $('<textarea>').addClass('urlbox form-control').css('width', '100%')
+                    .attr({rows: 3, readonly: true}).appendTo(dialog);
 
-            var $dialog = $('<div>').addClass('showurldialog').append('<p>'+rcmail.gettext('caldavurldescription', 'tasklist')+'</p>'),
-                textbox = $('<textarea>').addClass('urlbox').css('width', '100%').attr('rows', 2).appendTo($dialog);
-
-            $dialog.dialog({
-                resizable: true,
-                closeOnEscape: true,
-                title: rcmail.gettext('showcaldavurl', 'tasklist'),
-                close: function() {
-                  $dialog.dialog("destroy").remove();
-                },
-                width: 520
-            }).show();
-
-            textbox.val(list.caldavurl).select();
+            rcmail.simple_dialog(dialog, 'tasklist.showcaldavurl', null, {
+                open: function() { textbox.val(list.caldavurl).select(); },
+                cancel_button: 'close'
+            });
         }
     }
 
@@ -3165,8 +3241,9 @@ function rcube_tasklist_ui(settings)
         }
     }
 
-
-    // method to show the print dialog.
+    /**
+     * Method to show the tasks print page.
+     */
     function print_tasks()
     {
         var param = {}, active = active_lists();
@@ -3245,14 +3322,6 @@ function rcube_tasklist_ui(settings)
         return active;
     }
 
-    // resize and reposition (center) the dialog window
-    this.dialog_resize = function(id, height, width)
-    {
-        var win = $(window), w = win.width(), h = win.height();
-            $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) })
-                .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
-    };
-
     /**
      * Enable/disable focusview mode for the given list
      */
@@ -3307,29 +3376,8 @@ function rcube_tasklist_ui(settings)
     init_taskedit();
 }
 
-
-// extend jQuery
-// from http://james.padolsey.com/javascript/sorting-elements-with-jquery/
-jQuery.fn.sortElements = (function(){
-    var sort = [].sort;
-
-    return function(comparator, getSortable) {
-        getSortable = getSortable || function(){ return this };
-
-        var last = null;
-        return sort.call(this, comparator).each(function(i){
-            // at this point the array is sorted, so we can just detach each one from wherever it is, and add it after the last
-            var node = $(getSortable.call(this));
-            var parent = node.parent();
-            if (last) last.after(node);
-            else      parent.prepend(node);
-            last = node;
-        });
-    };
-})();
-
 // equivalent to $.unique() but working on arrays of strings
-jQuery.unqiqueStrings = (function() {
+jQuery.uniqueStrings = (function() {
     return function(arr) {
         var hash = {}, out = [];
 
@@ -3344,27 +3392,69 @@ jQuery.unqiqueStrings = (function() {
     };
 })();
 
+/**
+ * Tasks list options dialog
+ */
+function tasklist_options_menu(p)
+{
+    var content = $('#listoptions-menu'),
+        width = content.width() + 25,
+        dialog = content.clone(true);
+
+    // set form values
+    $('#options-sortcol', dialog).val(rctasks.get_setting('sort_col') || 'auto');
+    $('#options-ord', dialog).val(rctasks.get_setting('sort_order') || 'asc');
+
+    // Fix id/for attributes
+    $('select', dialog).each(function() { this.id = this.id + '-clone'; });
+    $('label', dialog).each(function() { $(this).attr('for', $(this).attr('for') + '-clone'); });
+
+    var save_func = function(e) {
+        if (rcube_event.is_keyboard(e.originalEvent)) {
+            $('#listmenulink').focus();
+        }
+
+        var col = $('#options-sortcol-clone', dialog).val(),
+            ord = $('#options-ord-clone', dialog).val();
+
+        rctasks.list_set_sort_and_order(col, ord);
+        return true;
+    };
+
+    dialog = rcmail.simple_dialog(dialog, rcmail.gettext('listoptionstitle'), save_func, {
+        closeOnEscape: true,
+        minWidth: 400,
+        width: width
+    });
+};
+
 
 /* tasklist plugin UI initialization */
 var rctasks;
+
 window.rcmail && rcmail.addEventListener('init', function(evt) {
+    rctasks = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, rcmail.env.libcal_settings));
 
-  rctasks = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, rcmail.env.libcal_settings));
+    // register button commands
+    rcmail.register_command('newtask', function(){ rctasks.edit_task(null, 'new', {}); }, true);
+    rcmail.register_command('print', function(){ rctasks.print_tasks(); }, true);
+    rcmail.register_command('import', function(){ rctasks.import_tasks(rctasks.selected_list); }, true);
+    rcmail.register_command('edit-task', function(){ rctasks.edit_task(rctasks.selected_task.id, 'edit'); });
+    rcmail.register_command('delete-task', function(){ rctasks.delete_task(rctasks.selected_task.id); });
+    rcmail.register_command('add-child-task', function(){ rctasks.add_childtask(rctasks.selected_task.id); });
+    rcmail.register_command('save-task', function(){ rcmail.env.task_save_func(); });
 
-  // register button commands
-  rcmail.register_command('newtask', function(){ rctasks.edit_task(null, 'new', {}); }, true);
-  rcmail.register_command('print', function(){ rctasks.print_tasks(); }, true);
+    rcmail.register_command('list-create', function(){ rctasks.list_edit_dialog(null); }, true);
+    rcmail.register_command('list-edit', function(){ rctasks.list_edit_dialog(rctasks.selected_list); }, false);
+    rcmail.register_command('list-delete', function(){ rctasks.list_delete(rctasks.selected_list); }, false);
+    rcmail.register_command('list-remove', function(){ rctasks.list_remove(rctasks.selected_list); }, false);
+    rcmail.register_command('list-showurl', function(){ rctasks.list_showurl(rctasks.selected_list); }, false);
 
-  rcmail.register_command('list-create', function(){ rctasks.list_edit_dialog(null); }, true);
-  rcmail.register_command('list-edit', function(){ rctasks.list_edit_dialog(rctasks.selected_list); }, false);
-  rcmail.register_command('list-delete', function(){ rctasks.list_delete(rctasks.selected_list); }, false);
-  rcmail.register_command('list-remove', function(){ rctasks.list_remove(rctasks.selected_list); }, false);
-  rcmail.register_command('list-showurl', function(){ rctasks.list_showurl(rctasks.selected_list); }, false);
+    rcmail.register_command('export', function(){ rctasks.export_tasks(); }, true);
+    rcmail.register_command('search', function(){ rctasks.quicksearch(); }, true);
+    rcmail.register_command('reset-search', function(){ rctasks.reset_search(); }, true);
+    rcmail.register_command('expand-all', function(){ rctasks.expand_collapse(true); }, true);
+    rcmail.register_command('collapse-all', function(){ rctasks.expand_collapse(false); }, true);
 
-  rcmail.register_command('search', function(){ rctasks.quicksearch(); }, true);
-  rcmail.register_command('reset-search', function(){ rctasks.reset_search(); }, true);
-  rcmail.register_command('expand-all', function(){ rctasks.expand_collapse(true); }, true);
-  rcmail.register_command('collapse-all', function(){ rctasks.expand_collapse(false); }, true);
-
-  rctasks.init();
+    rctasks.init();
 });
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 457f66d6..d024890e 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -55,15 +55,17 @@ class tasklist extends rcube_plugin
 
     public $rc;
     public $lib;
-    public $driver;
     public $timezone;
     public $ui;
     public $home;  // declare public to be used in other classes
 
+    // These are handled by __get()
+    // public $driver;
+    // public $itip;
+    // public $ical;
+
     private $collapsed_tasks = array();
-    private $message_tasks = array();
-    private $itip;
-    private $ical;
+    private $message_tasks   = array();
 
 
     /**
@@ -72,6 +74,7 @@ class tasklist extends rcube_plugin
     function init()
     {
         $this->require_plugin('libcalendaring');
+        $this->require_plugin('libkolab');
         $this->require_plugin('jqueryui');
 
         $this->rc  = rcube::get_instance();
@@ -113,10 +116,11 @@ class tasklist extends rcube_plugin
             $this->register_action('counts', array($this, 'fetch_counts'));
             $this->register_action('fetch', array($this, 'fetch_tasks'));
             $this->register_action('print', array($this, 'print_tasks'));
-            $this->register_action('inlineui', array($this, 'get_inline_ui'));
-            $this->register_action('mail2task', array($this, 'mail_message2task'));
+            $this->register_action('dialog-ui', array($this, 'mail_message2task'));
             $this->register_action('get-attachment', array($this, 'attachment_get'));
             $this->register_action('upload', array($this, 'attachment_upload'));
+            $this->register_action('import', array($this, 'import_tasks'));
+            $this->register_action('export', array($this, 'export_tasks'));
             $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
             $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
             $this->register_action('itip-status', array($this, 'task_itip_status'));
@@ -136,7 +140,7 @@ class tasklist extends rcube_plugin
             }
 
             // add 'Create event' item to message menu
-            if ($this->api->output->type == 'html') {
+            if ($this->api->output->type == 'html' && $_GET['_rel'] != 'task') {
                 $this->api->add_content(html::tag('li', null, 
                     $this->api->output->button(array(
                         'command'  => 'tasklist-create-from-mail',
@@ -178,8 +182,9 @@ class tasklist extends rcube_plugin
      */
     private function load_driver()
     {
-        if (is_object($this->driver))
+        if (is_object($this->driver)) {
             return;
+        }
 
         $driver_name  = $this->rc->config->get('tasklist_driver', 'database');
         $driver_class = 'tasklist_' . $driver_name . '_driver';
@@ -187,18 +192,11 @@ class tasklist extends rcube_plugin
         require_once($this->home . '/drivers/tasklist_driver.php');
         require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
 
-        switch ($driver_name) {
-        case "kolab":
-            $this->require_plugin('libkolab');
-        default:
-            $this->driver = new $driver_class($this);
-            break;
-        }
+        $this->driver = new $driver_class($this);
 
         $this->rc->output->set_env('tasklist_driver', $driver_name);
     }
 
-
     /**
      * Dispatcher for task-related actions initiated by the client
      */
@@ -252,12 +250,16 @@ class tasklist extends rcube_plugin
             $rec = $this->prepare_task($rec);
             $clone = $this->handle_recurrence($rec, $this->driver->get_task($rec));
             if ($success = $this->driver->edit_task($rec)) {
-                $refresh[] = $this->driver->get_task($rec);
+                $new_task = $this->driver->get_task($rec);
+                $new_task['tempid'] = $rec['id'];
+                $refresh[] = $new_task;
                 $this->cleanup_task($rec);
 
                 // add clone from recurring task
                 if ($clone && $this->driver->create_task($clone)) {
-                    $refresh[] = $this->driver->get_task($clone);
+                    $new_clone = $this->driver->get_task($clone);
+                    $new_clone['tempid'] = $clone['id'];
+                    $refresh[] = $new_clone;
                     $this->driver->clear_alarms($rec['id']);
                 }
 
@@ -268,6 +270,7 @@ class tasklist extends rcube_plugin
                         if ($this->driver->move_task($child)) {
                             $r = $this->driver->get_task($child);
                             if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
+                                $r['tempid'] = $cid;
                                 $refresh[] = $r;
                             }
                         }
@@ -325,7 +328,10 @@ class tasklist extends rcube_plugin
                 }
                 // update parent task to adjust list of children
                 if (!empty($oldrec['parent_id'])) {
-                    $refresh[] = $this->driver->get_task(array('id' => $oldrec['parent_id'], 'list' => $rec['list']));
+                    $parent = array('id' => $oldrec['parent_id'], 'list' => $rec['list']);
+                    if ($parent = $this->driver->get_task()) {
+                        $refresh[] = $parent;
+                    }
                 }
             }
 
@@ -522,9 +528,12 @@ class tasklist extends rcube_plugin
                     $this->rc->output->show_message('tasklist.errornotifying', 'error');
             }
         }
-        else if ($success && $rec['_reportpartstat'] && $rec['_reportpartstat'] != 'NEEDS-ACTION') {
+
+        if ($success && $rec['_reportpartstat'] && $rec['_reportpartstat'] != 'NEEDS-ACTION') {
             // get the full record after update
-            $task = $this->driver->get_task($rec);
+            if (!$task) {
+                $task = $this->driver->get_task($rec);
+            }
 
             // send iTip REPLY with the updated partstat
             if ($task['organizer'] && ($idx = $this->is_attendee($task)) !== false) {
@@ -545,7 +554,7 @@ class tasklist extends rcube_plugin
         }
 
         // unlock client
-        $this->rc->output->command('plugin.unlock_saving');
+        $this->rc->output->command('plugin.unlock_saving', $success);
 
         if ($refresh) {
             if ($refresh['id']) {
@@ -557,6 +566,9 @@ class tasklist extends rcube_plugin
             }
             $this->rc->output->command('plugin.update_task', $refresh);
         }
+        else if ($success && ($action == 'delete' || $action == 'undelete')) {
+            $this->rc->output->command('plugin.refresh_tagcloud');
+        }
     }
 
     /**
@@ -978,6 +990,7 @@ class tasklist extends rcube_plugin
         switch ($action) {
         case 'form-new':
         case 'form-edit':
+            $this->load_ui();
             echo $this->ui->tasklist_editform($action, $list);
             exit;
 
@@ -1034,7 +1047,7 @@ class tasklist extends rcube_plugin
             }
             // report more results available
             if ($this->driver->search_more_results) {
-                $this->rc->output->show_message('autocompletemore', 'info');
+                $this->rc->output->show_message('autocompletemore', 'notice');
             }
 
             $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
@@ -1083,49 +1096,19 @@ class tasklist extends rcube_plugin
      */
     public function fetch_tasks()
     {
-        $f = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
+        $mask   = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
         $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        $filter = array('mask' => $f, 'search' => $search);
-/*
-        // convert magic date filters into a real date range
-        switch ($f) {
-        case self::FILTER_MASK_TODAY:
-            $today = new DateTime('now', $this->timezone);
-            $filter['from'] = $filter['to'] = $today->format('Y-m-d');
-            break;
+        $filter = array('mask' => $mask, 'search' => $search);
 
-        case self::FILTER_MASK_TOMORROW:
-            $tomorrow = new DateTime('now + 1 day', $this->timezone);
-            $filter['from'] = $filter['to'] = $tomorrow->format('Y-m-d');
-            break;
+        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists));
 
-        case self::FILTER_MASK_OVERDUE:
-            $yesterday = new DateTime('yesterday', $this->timezone);
-            $filter['to'] = $yesterday->format('Y-m-d');
-            break;
-
-        case self::FILTER_MASK_WEEK:
-            $today = new DateTime('now', $this->timezone);
-            $filter['from'] = $today->format('Y-m-d');
-            $weekend = new DateTime('now + 7 days', $this->timezone);
-            $filter['to'] = $weekend->format('Y-m-d');
-            break;
-
-        case self::FILTER_MASK_LATER:
-            $date = new DateTime('now + 8 days', $this->timezone);
-            $filter['from'] = $date->format('Y-m-d');
-            break;
-
-        }
-*/
-        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists), $f);
         $this->rc->output->command('plugin.data_ready', array(
-            'filter' => $f,
-            'lists' => $lists,
-            'search' => $search,
-            'data' => $data,
-            'tags' => $this->driver->get_tags(),
+                'filter' => $mask,
+                'lists'  => $lists,
+                'search' => $search,
+                'data'   => $data,
+                'tags'   => $this->driver->get_tags(),
         ));
     }
 
@@ -1153,16 +1136,17 @@ class tasklist extends rcube_plugin
      */
     public function print_tasks_list($attrib)
     {
-        $f      = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
+        $mask   = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
         $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        $filter = array('mask' => $f, 'search' => $search);
+        $filter = array('mask' => $mask, 'search' => $search);
 
-        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists), $f);
+        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists));
 
         // we'll build the tasks table in javascript on page load
         // where we have sorting methods, etc.
         $this->rc->output->set_env('tasks', $data);
+        $this->rc->output->set_env('filtermask', $mask);
 
         return $this->ui->tasks_resultview($attrib);
     }
@@ -1170,7 +1154,7 @@ class tasklist extends rcube_plugin
     /**
      * Prepare and sort the given task records to be sent to the client
      */
-    private function tasks_data($records, $f)
+    private function tasks_data($records)
     {
         $data = $this->task_tree = $this->task_titles = array();
 
@@ -1181,9 +1165,7 @@ class tasklist extends rcube_plugin
 
             $this->encode_task($rec);
 
-            // apply filter; don't trust the driver on this :-)
-            if ((!$f && !$this->driver->is_complete($rec)) || ($rec['mask'] & $f))
-                $data[] = $rec;
+            $data[] = $rec;
         }
 
         // assign hierarchy level indicators for later sorting
@@ -1319,19 +1301,27 @@ class tasklist extends rcube_plugin
      */
     public function filter_mask($rec)
     {
-        static $today, $tomorrow, $weeklimit;
+        static $today, $today_date, $tomorrow, $weeklimit;
 
         if (!$today) {
-            $today_date = new DateTime('now', $this->timezone);
-            $today = $today_date->format('Y-m-d');
+            $today_date    = new DateTime('now', $this->timezone);
+            $today         = $today_date->format('Y-m-d');
             $tomorrow_date = new DateTime('now + 1 day', $this->timezone);
-            $tomorrow = $tomorrow_date->format('Y-m-d');
-            $week_date = new DateTime('now + 7 days', $this->timezone);
-            $weeklimit = $week_date->format('Y-m-d');
+            $tomorrow      = $tomorrow_date->format('Y-m-d');
+
+            // In Kolab-mode we hide "Next 7 days" filter, which means
+            // "Later" should catch tasks with date after tomorrow (#5353)
+            if ($this->rc->output->get_env('tasklist_driver') == 'kolab') {
+                $weeklimit = $tomorrow;
+            }
+            else {
+                $week_date = new DateTime('now + 7 days', $this->timezone);
+                $weeklimit = $week_date->format('Y-m-d');
+            }
         }
 
-        $mask = 0;
-        $start = $rec['startdate'] ?: '1900-00-00';
+        $mask    = 0;
+        $start   = $rec['startdate'] ?: '1900-00-00';
         $duedate = $rec['date'] ?: '3000-00-00';
 
         if ($rec['flagged'])
@@ -1344,14 +1334,63 @@ class tasklist extends rcube_plugin
         else if ($rec['date'] < $today)
             $mask |= self::FILTER_MASK_OVERDUE;
 
-        if ($duedate <= $today || ($rec['startdate'] && $start <= $today))
-            $mask |= self::FILTER_MASK_TODAY;
-        if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
-            $mask |= self::FILTER_MASK_TOMORROW;
-        if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
-            $mask |= self::FILTER_MASK_WEEK;
-        else if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
-            $mask |= self::FILTER_MASK_LATER;
+        if (empty($rec['recurrence']) || $duedate < $today || $start > $weeklimit) {
+            if ($duedate <= $today || ($rec['startdate'] && $start <= $today))
+                $mask |= self::FILTER_MASK_TODAY;
+            else if (($start > $today && $start <= $tomorrow) || ($duedate > $today && $duedate <= $tomorrow))
+                $mask |= self::FILTER_MASK_TOMORROW;
+            else if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
+                $mask |= self::FILTER_MASK_WEEK;
+            else if ($start > $weeklimit || $duedate > $weeklimit)
+                $mask |= self::FILTER_MASK_LATER;
+        }
+        else if ($rec['startdate'] || $rec['date']) {
+            $date = new DateTime($rec['startdate'] ?: $rec['date'], $this->timezone);
+
+            // set safe recurrence start
+            while ($date->format('Y-m-d') >= $today) {
+                switch ($rec['recurrence']['FREQ']) {
+                    case 'DAILY':
+                        $date = clone $today_date;
+                        $date->sub(new DateInterval('P1D'));
+                        break;
+                    case 'WEEKLY': $date->sub(new DateInterval('P7D')); break;
+                    case 'MONTHLY': $date->sub(new DateInterval('P1M')); break;
+                    case 'YEARLY': $date->sub(new DateInterval('P1Y')); break;
+                    default; break 2;
+                }
+            }
+
+            $date->_dateonly = true;
+
+            $engine = libcalendaring::get_recurrence();
+            $engine->init($rec['recurrence'], $date);
+
+            // check task occurrences (stop next week)
+            // FIXME: is there a faster way of doing this?
+            while ($date = $engine->next()) {
+                $date = $date->format('Y-m-d');
+
+                // break iteration asap
+                if ($date > $duedate || ($mask & self::FILTER_MASK_LATER)) {
+                    break;
+                }
+
+                if ($date == $today) {
+                    $mask |= self::FILTER_MASK_TODAY;
+                }
+                else if ($date == $tomorrow) {
+                    $mask |= self::FILTER_MASK_TOMORROW;
+                }
+                else if ($date > $tomorrow && $date <= $weeklimit) {
+                    $mask |= self::FILTER_MASK_WEEK;
+                }
+                else if ($date > $weeklimit) {
+                    $mask |= self::FILTER_MASK_LATER;
+                    break;
+                }
+            }
+        }
 
         // add masks for assigned tasks
         if ($this->is_organizer($rec) && !empty($rec['attendees']) && $this->is_attendee($rec) === false)
@@ -1401,48 +1440,12 @@ class tasklist extends rcube_plugin
         $this->rc->output->set_env('autocomplete_threads', (int)$this->rc->config->get('autocomplete_threads', 0));
         $this->rc->output->set_env('autocomplete_max', (int)$this->rc->config->get('autocomplete_max', 15));
         $this->rc->output->set_env('autocomplete_min_length', $this->rc->config->get('autocomplete_min_length'));
-        $this->rc->output->add_label('autocompletechars', 'autocompletemore', 'delete', 'close', 'libcalendaring.expandattendeegroup', 'libcalendaring.expandattendeegroupnodata');
+        $this->rc->output->add_label('autocompletechars', 'autocompletemore', 'delete', 'close');
 
         $this->rc->output->set_pagetitle($this->gettext('navtitle'));
         $this->rc->output->send('tasklist.mainview');
     }
 
-
-    /**
-     *
-     */
-    public function get_inline_ui()
-    {
-        foreach (array('save','cancel','savingdata') as $label)
-            $texts['tasklist.'.$label] = $this->gettext($label);
-
-        $texts['tasklist.newtask'] = $this->gettext('createfrommail');
-
-
-        $this->ui->init_templates();
-        $this->ui->tasklists();
-
-        // collect env variables
-        $env = array(
-            'tasklists' => $this->rc->output->get_env('tasklists'),
-            'tasklist_settings' => $this->ui->load_settings(),
-        );
-
-        echo $this->api->output->parse('tasklist.taskedit', false, false);
-
-        $script_add = '';
-        foreach ($this->ui->get_gui_objects() as $obj => $id) {
-            $script_add .= rcmail_output::JS_OBJECT_NAME . ".gui_object('$obj', '$id');\n";
-        }
-
-        echo html::tag('script', array('type' => 'text/javascript'),
-            rcmail_output::JS_OBJECT_NAME . ".set_env(" . json_encode($env) . ");\n".
-            rcmail_output::JS_OBJECT_NAME . ".add_label(" . json_encode($texts) . ");\n".
-            $script_add
-        );
-        exit;
-    }
-
     /**
      * Handler for keep-alive requests
      * This will check for updated data in active lists and sync them to the client
@@ -1464,7 +1467,7 @@ class tasklist extends rcube_plugin
 
         $updates = $this->driver->list_tasks($filter, $lists);
         if (!empty($updates)) {
-            $this->rc->output->command('plugin.refresh_tasks', $this->tasks_data($updates, 255), true);
+            $this->rc->output->command('plugin.refresh_tasks', $this->tasks_data($updates), true);
 
             // update counts
             $counts = $this->driver->count_tasks($lists);
@@ -1508,6 +1511,199 @@ class tasklist extends rcube_plugin
         return $p;
     }
 
+    /**
+     * Handler for importing .ics files
+     */
+    function import_tasks()
+    {
+        // Upload progress update
+        if (!empty($_GET['_progress'])) {
+            $this->rc->upload_progress();
+        }
+
+        @set_time_limit(0);
+
+        // process uploaded file if there is no error
+        $err = $_FILES['_data']['error'];
+
+        if (!$err && $_FILES['_data']['tmp_name']) {
+            $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+            $lists  = $this->driver->get_lists();
+            $list   = $lists[$source] ?: $this->get_default_tasklist();
+            $source = $list['id'];
+
+            // extract zip file
+            if ($_FILES['_data']['type'] == 'application/zip') {
+                $count = 0;
+                if (class_exists('ZipArchive', false)) {
+                    $zip = new ZipArchive();
+                    if ($zip->open($_FILES['_data']['tmp_name'])) {
+                        $randname = uniqid('zip-' . session_id(), true);
+                        $tmpdir   = slashify($this->rc->config->get('temp_dir', sys_get_temp_dir())) . $randname;
+                        mkdir($tmpdir, 0700);
+
+                        // extract each ical file from the archive and import it
+                        for ($i = 0; $i < $zip->numFiles; $i++) { 
+                            $filename = $zip->getNameIndex($i);
+                            if (preg_match('/\.ics$/i', $filename)) {
+                                $tmpfile = $tmpdir . '/' . basename($filename);
+                                if (copy('zip://' . $_FILES['_data']['tmp_name'] . '#'.$filename, $tmpfile)) {
+                                    $count += $this->import_from_file($tmpfile, $source, $errors);
+                                    unlink($tmpfile);
+                                }
+                            }
+                        }
+
+                        rmdir($tmpdir);
+                        $zip->close();
+                    }
+                    else {
+                        $errors = 1;
+                        $msg = 'Failed to open zip file.';
+                    }
+                }
+                else {
+                    $errors = 1;
+                    $msg = 'Zip files are not supported for import.';
+                }
+            }
+            else {
+                // attempt to import the uploaded file directly
+                $count = $this->import_from_file($_FILES['_data']['tmp_name'], $source, $errors);
+            }
+
+            if ($count) {
+                $this->rc->output->command('display_message', $this->gettext(array('name' => 'importsuccess', 'vars' => array('nr' => $count))), 'confirmation');
+                $this->rc->output->command('plugin.import_success', array('source' => $source, 'refetch' => true));
+            }
+            else if (!$errors) {
+                $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
+                $this->rc->output->command('plugin.import_success', array('source' => $source));
+            }
+            else {
+                $this->rc->output->command('plugin.import_error', array('message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : '')));
+            }
+        }
+        else {
+            if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
+                    'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+            }
+            else {
+                $msg = $this->rc->gettext('fileuploaderror');
+            }
+
+            $this->rc->output->command('plugin.import_error', array('message' => $msg));
+        }
+
+        $this->rc->output->send('iframe');
+    }
+
+    /**
+     * Helper function to parse and import a single .ics file
+     */
+    private function import_from_file($filepath, $source, &$errors)
+    {
+        $user_email = $this->rc->user->get_username();
+        $ical       = $this->get_ical();
+        $errors     = !$ical->fopen($filepath);
+        $count      = $i = 0;
+
+        foreach ($ical as $task) {
+            // keep the browser connection alive on long import jobs
+            if (++$i > 100 && $i % 100 == 0) {
+                echo "<!-- -->";
+                ob_flush();
+            }
+
+            if ($task['_type'] == 'task') {
+                $task['list'] = $source;
+
+                if ($this->driver->create_task($task)) {
+                    $count++;
+                }
+                else {
+                    $errors++;
+                }
+            }
+        }
+
+        return $count;
+    }
+
+    /**
+     * Construct the ics file for exporting tasks to iCalendar format
+     */
+    function export_tasks()
+    {
+        $source      = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+        $task_id     = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
+        $attachments = (bool) rcube_utils::get_input_value('attachments', rcube_utils::INPUT_GPC);
+
+        $this->load_driver();
+
+        $browser = new rcube_browser;
+        $lists   = $this->driver->get_lists();
+        $tasks   = array();
+        $filter  = array();
+
+        // get message UIDs for filter
+        if ($source && ($list = $lists[$source])) {
+            $filename = html_entity_decode($list['name']) ?: $sorce;
+            $filter   = array($source => true);
+        }
+        else if ($task_id) {
+            $filename = 'tasks';
+            foreach (explode(',', $task_id) as $id) {
+                list($list_id, $task_id) = explode(':', $id, 2);
+                if ($list_id && $task_id) {
+                    $filter[$list_id][] = $task_id;
+                }
+            }
+        }
+
+        // Get tasks
+        foreach ($filter as $list_id => $uids) {
+            $_filter = is_array($uids) ? array('uid' => $uids) : null;
+            $_tasks  = $this->driver->list_tasks($_filter, $list_id);
+            if (!empty($_tasks)) {
+                $tasks = array_merge($tasks, $_tasks);
+            }
+        }
+
+        // Set file name
+        if ($source && count($tasks) == 1) {
+            $filename = $tasks[0]['title'] ?: 'task';
+        }
+        $filename .= '.ics';
+        $filename = $browser->ie ? rawurlencode($filename) : addcslashes($filename, '"');
+
+        $tasks = array_map(array($this, 'to_libcal'), $tasks);
+
+        // Give plugins a possibility to implement other output formats or modify the result
+        $plugin = $this->rc->plugins->exec_hook('tasks_export', array(
+                'result'      => $tasks,
+                'attachments' => $attachments,
+                'filename'    => $filename,
+                'plugin'      => $this,
+        ));
+
+        if ($plugin['abort']) {
+            exit;
+        }
+
+        $this->rc->output->nocacheing_headers();
+
+        // don't kill the connection if download takes more than 30 sec.
+        @set_time_limit(0);
+        header("Content-Type: text/calendar");
+        header("Content-Disposition: inline; filename=\"". $plugin['filename'] ."\"");
+
+        $this->get_ical()->export($plugin['result'], '', true,
+            $plugins['attachments'] ? array($this->driver, 'get_attachment_body') : null);
+        exit;
+    }
+
 
     /******* Attachment handling  *******/
 
@@ -1516,7 +1712,8 @@ class tasklist extends rcube_plugin
     */
     public function attachment_upload()
     {
-        $this->lib->attachment_upload(self::SESSION_KEY);
+        $handler = new kolab_attachments_handler();
+        $handler->attachment_upload(self::SESSION_KEY);
     }
 
     /**
@@ -1524,9 +1721,11 @@ class tasklist extends rcube_plugin
      */
     public function attachment_get()
     {
+        $handler = new kolab_attachments_handler();
+
         // show loading page
         if (!empty($_GET['_preload'])) {
-            return $this->lib->attachment_loading_page();
+            return $handler->attachment_loading_page();
         }
 
         $task = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
@@ -1534,20 +1733,17 @@ class tasklist extends rcube_plugin
         $id   = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $rev  = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
 
-        $task = array('id' => $task, 'list' => $list, 'rev' => $rev);
+        $task       = array('id' => $task, 'list' => $list, 'rev' => $rev);
         $attachment = $this->driver->get_attachment($id, $task);
 
         // show part page
         if (!empty($_GET['_frame'])) {
-            $this->lib->attachment = $attachment;
-            $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame'));
-            $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header'));
-            $this->rc->output->send('tasklist.attachment');
+            $handler->attachment_page($attachment);
         }
         // deliver attachment content
         else if ($attachment) {
             $attachment['body'] = $this->driver->get_attachment_body($id, $task);
-            $this->lib->attachment_get($attachment);
+            $handler->attachment_get($attachment);
         }
 
         // if we arrive here, the requested part was not found
@@ -1560,19 +1756,22 @@ class tasklist extends rcube_plugin
 
     public function mail_message2task()
     {
-        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+        $this->load_ui();
+        $this->ui->init();
+        $this->ui->init_templates();
+        $this->ui->tasklists();
+
+        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
         $task = array();
 
-        // establish imap connection
-        $imap = $this->rc->get_storage();
-        $imap->set_folder($mbox);
-        $message = new rcube_message($uid);
+        $imap    = $this->rc->get_storage();
+        $message = new rcube_message($uid, $mbox);
 
         if ($message->headers) {
-            $task['title'] = trim($message->subject);
+            $task['title']       = trim($message->subject);
             $task['description'] = trim($message->first_text_part());
-            $task['id'] = -$uid;
+            $task['id']          = -$uid;
 
             $this->load_driver();
 
@@ -1583,18 +1782,19 @@ class tasklist extends rcube_plugin
             // copy mail attachments to task
             else if ($message->attachments && $this->driver->attachments) {
                 if (!is_array($_SESSION[self::SESSION_KEY]) || $_SESSION[self::SESSION_KEY]['id'] != $task['id']) {
-                    $_SESSION[self::SESSION_KEY] = array();
-                    $_SESSION[self::SESSION_KEY]['id'] = $task['id'];
-                    $_SESSION[self::SESSION_KEY]['attachments'] = array();
+                    $_SESSION[self::SESSION_KEY] = array(
+                        'id'          => $task['id'],
+                        'attachments' => array(),
+                    );
                 }
 
                 foreach ((array)$message->attachments as $part) {
                     $attachment = array(
-                        'data' => $imap->get_message_part($uid, $part->mime_id, $part),
-                        'size' => $part->size,
-                        'name' => $part->filename,
+                        'data'     => $imap->get_message_part($uid, $part->mime_id, $part),
+                        'size'     => $part->size,
+                        'name'     => $part->filename,
                         'mimetype' => $part->mimetype,
-                        'group' => $task['id'],
+                        'group'    => $task['id'],
                     );
 
                     $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
@@ -1613,13 +1813,13 @@ class tasklist extends rcube_plugin
                 }
             }
 
-            $this->rc->output->command('plugin.mail2taskdialog', $task);
+            $this->rc->output->set_env('task_prop', $task);
         }
         else {
             $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
         }
 
-        $this->rc->output->send();
+        $this->rc->output->send('tasklist.dialog');
     }
 
     /**
@@ -1647,7 +1847,7 @@ class tasklist extends rcube_plugin
 
             // get prepared inline UI for this event object
             if ($ical_objects->method) {
-                $html .= html::div('tasklist-invitebox',
+                $html .= html::div('tasklist-invitebox invitebox boxinformation',
                     $this->itip->mail_itip_inline_ui(
                         $task,
                         $ical_objects->method,
@@ -1689,7 +1889,7 @@ class tasklist extends rcube_plugin
             );
         }
         if (count($links)) {
-            $html .= html::div('messagetasklinks', html::tag('ul', 'tasklist', join("\n", $links)));
+            $html .= html::div('messagetasklinks boxinformation', html::tag('ul', 'tasklist', join("\n", $links)));
         }
 
         // prepend iTip/relation boxes to message body
@@ -1758,9 +1958,12 @@ class tasklist extends rcube_plugin
     /**
      * Get properties of the tasklist this user has specified as default
      */
-    public function get_default_tasklist($sensitivity = null)
+    public function get_default_tasklist($sensitivity = null, $lists = null)
     {
-        $lists = $this->driver->get_lists();
+        if ($lists === null) {
+            $lists = $this->driver->get_lists(tasklist_driver::FILTER_PERSONAL | tasklist_driver::FILTER_WRITEABLE);
+        }
+
         $list = null;
 
         foreach ($lists as $l) {
@@ -1854,12 +2057,12 @@ class tasklist extends rcube_plugin
         $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
         $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
         $status  = rcube_utils::get_input_value('_status', rcube_utils::INPUT_POST);
+        $comment = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
         $delete  = intval(rcube_utils::get_input_value('_del', rcube_utils::INPUT_POST));
         $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST)) || $status == 'needs-action';
 
         $error_msg = $this->gettext('errorimportingtask');
         $success   = false;
-        $delegate = null;
 
         if ($status == 'delegated') {
             $delegates = rcube_mime::decode_address_list(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true), 1, false);
@@ -1877,26 +2080,34 @@ class tasklist extends rcube_plugin
 
             // forward iTip request to delegatee
             if ($delegate) {
-                $rsvpme = intval(rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST));
+                $rsvpme = rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST);
+                $itip   = $this->load_itip();
 
-                $itip = $this->load_itip();
-                if ($itip->delegate_to($task, $delegate, $rsvpme ? true : false)) {
+                $task['comment'] = $comment;
+
+                if ($itip->delegate_to($task, $delegate, !empty($rsvpme))) {
                     $this->rc->output->show_message('tasklist.itipsendsuccess', 'confirmation');
                 }
                 else {
                     $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
                 }
+
+                unset($task['comment']);
             }
 
+            $mode = tasklist_driver::FILTER_PERSONAL
+                | tasklist_driver::FILTER_SHARED
+                | tasklist_driver::FILTER_WRITEABLE;
+
             // find writeable list to store the task
             $list_id = !empty($_REQUEST['_folder']) ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
-            $lists   = $this->driver->get_lists();
+            $lists   = $this->driver->get_lists($mode);
             $list    = $lists[$list_id];
             $dontsave = ($_REQUEST['_folder'] === '' && $task['_method'] == 'REQUEST');
 
             // select default list except user explicitly selected 'none'
             if (!$list && !$dontsave) {
-                $list = $this->get_default_tasklist($task['sensitivity']);
+                $list = $this->get_default_tasklist($task['sensitivity'], $lists);
             }
 
             $metadata = array(
@@ -1944,7 +2155,7 @@ class tasklist extends rcube_plugin
                 $task['list'] = $list['id'];
 
                 // check for existing task with the same UID
-                $existing = $this->driver->get_task($task['uid']);
+                $existing = $this->find_task($task['uid'], $mode);
 
                 if ($existing) {
                     // only update attendee status
@@ -2014,23 +2225,22 @@ class tasklist extends rcube_plugin
 
                         // preserve my participant status for regular updates
                         if (empty($status)) {
-                            $emails = $this->lib->get_user_emails();
-                            foreach ($task['attendees'] as $i => $attendee) {
-                                if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
-                                    foreach ($existing['attendees'] as $j => $_attendee) {
-                                        if ($attendee['email'] == $_attendee['email']) {
-                                            $task['attendees'][$i] = $existing['attendees'][$j];
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
+                            $this->lib->merge_attendees($task, $existing);
                         }
 
                         // set status=CANCELLED on CANCEL messages
                         if ($task['_method'] == 'CANCEL') {
                             $task['status'] = 'CANCELLED';
                         }
+
+                        // update attachments list, allow attachments update only on REQUEST (#5342)
+                        if ($task['_method'] == 'REQUEST') {
+                            $task['deleted_attachments'] = true;
+                        }
+                        else {
+                            unset($task['attachments']);
+                        }
+
                         // show me as free when declined (#1670)
                         if ($status == 'declined' || $task['status'] == 'CANCELLED') {
                             $task['free_busy'] = 'free';
@@ -2083,7 +2293,7 @@ class tasklist extends rcube_plugin
 
         // send iTip reply
         if ($task['_method'] == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) {
-            $task['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
+            $task['comment'] = $comment;
             $itip = $this->load_itip();
             $itip->set_sender_email($reply_sender);
 
@@ -2109,6 +2319,28 @@ class tasklist extends rcube_plugin
         $this->mail_import_itip();
     }
 
+    /**
+     * Find a task in user tasklists
+     */
+    protected function find_task($task, &$mode)
+    {
+        $this->load_driver();
+
+        // We search for writeable folders in personal namespace by default
+        $mode   = tasklist_driver::FILTER_WRITEABLE | tasklist_driver::FILTER_PERSONAL;
+        $result = $this->driver->get_task($task, $mode);
+
+        // ... now check shared folders if not found
+        if (!$result) {
+            $result = $this->driver->get_task($task, tasklist_driver::FILTER_WRITEABLE | tasklist_driver::FILTER_SHARED);
+            if ($result) {
+                $mode |= tasklist_driver::FILTER_SHARED;
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Handler for task/itip-status requests
      */
@@ -2117,14 +2349,15 @@ class tasklist extends rcube_plugin
         $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
 
         // find local copy of the referenced task
-        $existing = $this->driver->get_task($data);
-        $itip     = $this->load_itip();
-        $response = $itip->get_itip_status($data, $existing);
+        $existing  = $this->find_task($data, $mode);
+        $is_shared = $mode & tasklist_driver::FILTER_SHARED;
+        $itip      = $this->load_itip();
+        $response  = $itip->get_itip_status($data, $existing);
 
         // get a list of writeable lists to save new tasks to
-        if (!$existing && $response['action'] == 'rsvp' || $response['action'] == 'import') {
-            $lists  = $this->driver->get_lists();
-            $select = new html_select(array('name' => 'tasklist', 'id' => 'itip-saveto', 'is_escaped' => true));
+        if ((!$existing || $is_shared) && $response['action'] == 'rsvp' || $response['action'] == 'import') {
+            $lists  = $this->driver->get_lists($mode);
+            $select = new html_select(array('name' => 'tasklist', 'id' => 'itip-saveto', 'is_escaped' => true, 'class' => 'form-control'));
             $select->add('--', '');
 
             foreach ($lists as $list) {
@@ -2135,9 +2368,9 @@ class tasklist extends rcube_plugin
         }
 
         if ($select) {
-            $default_list = $this->get_default_tasklist($data['sensitivity']);
+            $default_list = $this->get_default_tasklist($data['sensitivity'], $lists);
             $response['select'] = html::span('folder-select', $this->gettext('saveintasklist') . '&nbsp;' .
-                $select->show($default_list['id']));
+                $select->show($is_shared ? $existing['list'] : $default_list['id']));
         }
 
         $this->rc->output->command('plugin.update_itip_object_status', $response);
diff --git a/plugins/tasklist/tasklist_base.js b/plugins/tasklist/tasklist_base.js
index 1ecaa290..956bac2e 100644
--- a/plugins/tasklist/tasklist_base.js
+++ b/plugins/tasklist/tasklist_base.js
@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2013-2018, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -27,17 +27,8 @@
  
 function rcube_tasklist(settings)
 {
-    /* private vars */
-    var ui_loaded = false;
-    var me = this;
-    var mywin = window;
-
-    /*  public members  */
-    this.ui = null;
-
     /* public methods */
     this.create_from_mail = create_from_mail;
-    this.mail2taskdialog = mail2task_dialog;
     this.save_to_tasklist = save_to_tasklist;
 
 
@@ -46,51 +37,37 @@ function rcube_tasklist(settings)
      */
     function create_from_mail(uid)
     {
-        if (uid || (uid = rcmail.get_single_uid())) {
-            // load calendar UI (scripts and edit dialog template)
-            if (!ui_loaded) {
-                $.when(
-                    $.getScript(rcmail.assets_path('plugins/tasklist/tasklist.js')),
-                    $.get(rcmail.url('tasks/inlineui'), function(html) { $(document.body).append(html); }, 'html')
-                ).then(function() {
-                    // register attachments form
-                    // rcmail.gui_object('attachmentlist', 'attachmentlist');
-
-                    ui_loaded = true;
-                    me.ui = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, settings));
-                    create_from_mail(uid);  // start over
-                });
-
-                return;
-            }
-
-            // get message contents for task dialog
-            var lock = rcmail.set_busy(true, 'loading');
-            rcmail.http_post('tasks/mail2task', {
-                '_mbox': rcmail.env.mailbox,
-                '_uid': uid
-            }, lock);
+        if (!uid && !(uid = rcmail.get_single_uid())) {
+            return;
         }
-    }
 
-    /**
-     * Callback function to put the given task properties into the dialog
-     */
-    function mail2task_dialog(prop)
-    {
-        this.ui.edit_task(null, 'new', prop);
-        rcmail.addEventListener('responseaftertask', refresh_mailview);
-    }
+        var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1},
+            buttons = {},
+            button_classes = ['mainaction save', 'cancel'],
+            title = rcmail.gettext('tasklist.createfrommail'),
+            dialog = $('<iframe>').attr({
+                id: 'kolabtasksinlinegui',
+                name: 'kolabtasksdialog',
+                src: rcmail.url('tasks/dialog-ui', url)
+            });
 
-    /**
-     * Reload the mail view/preview to update the tasks listing
-     */
-    function refresh_mailview(e)
-    {
-        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : mywin;
-        if (win && e.response.action == 'task') {
-            win.location.reload();
-        }
+        // dialog buttons
+        buttons[rcmail.gettext('save')] = function() {
+            var frame = rcmail.get_frame_window('kolabtasksinlinegui');
+            frame.rcmail.command('save-task');
+        };
+
+        buttons[rcmail.gettext('cancel')] = function() {
+            dialog.dialog('destroy');
+        };
+
+        // open jquery UI dialog
+        window.kolab_task_dialog_element = dialog = rcmail.show_popup_dialog(dialog, title, buttons, {
+            button_classes: button_classes,
+            minWidth: 500,
+            width: 600,
+            height: 600
+        });
     }
 
     // handler for attachment-save-tasklist commands
@@ -108,7 +85,7 @@ function rcube_tasklist(settings)
     }
 
     // register event handlers on linked task items in message view
-    // the checkbox allows to mark a task as complete 
+    // the checkbox allows to mark a task as complete
     if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
         $('div.messagetasklinks input.complete').click(function(e) {
             var $this = $(this);
@@ -130,8 +107,6 @@ window.rcmail && rcmail.env.task == 'mail' && rcmail.addEventListener('init', fu
 
     rcmail.register_command('tasklist-create-from-mail', function() { tasks.create_from_mail(); });
     rcmail.register_command('attachment-save-task', function() { tasks.save_to_tasklist(); });
-    rcmail.addEventListener('plugin.mail2taskdialog', function(p) { tasks.mail2taskdialog(p); });
-    rcmail.addEventListener('plugin.unlock_saving', function(p) { tasks.ui && tasks.ui.unlock_saving(); });
 
     if (rcmail.env.action != 'show')
         rcmail.env.message_commands.push('tasklist-create-from-mail');
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index c67710b8..a6e9158f 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -51,13 +51,12 @@ class tasklist_ui
             'classsel'   => 'button-tasklist button-selected',
             'innerclass' => 'button-inner',
             'label'      => 'tasklist.navtitle',
+            'type'       => 'link'
         ), 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tasklist.css');
 
         if ($this->rc->task == 'mail' || $this->rc->task == 'tasks') {
-            jqueryui::tagedit();
-
             $this->plugin->include_script('tasklist_base.js');
 
             // copy config to client
@@ -144,30 +143,22 @@ class tasklist_ui
         $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
         $this->plugin->register_handler('plugin.quickaddform', array($this, 'quickadd_form'));
         $this->plugin->register_handler('plugin.tasks', array($this, 'tasks_resultview'));
-        $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
         $this->plugin->register_handler('plugin.tags_editline', array($this, 'tags_editline'));
         $this->plugin->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
         $this->plugin->register_handler('plugin.recurrence_form', array($this->plugin->lib, 'recurrence_form'));
-        $this->plugin->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
-        $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
-        $this->plugin->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
         $this->plugin->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
         $this->plugin->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
         $this->plugin->register_handler('plugin.identity_select', array($this, 'identity_select'));
         $this->plugin->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
         $this->plugin->register_handler('plugin.task_rsvp_buttons', array($this->plugin->itip, 'itip_rsvp_buttons'));
         $this->plugin->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
+        $this->plugin->register_handler('plugin.tasks_export_form', array($this, 'tasks_export_form'));
+        $this->plugin->register_handler('plugin.tasks_import_form', array($this, 'tasks_import_form'));
 
-        jqueryui::tagedit();
+        kolab_attachments_handler::ui();
 
         $this->plugin->include_script('tasklist.js');
-        $this->rc->output->include_script('treelist.js');
-
-        // include kolab folderlist widget if available
-        if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
-            $this->plugin->api->include_script('libkolab/js/folderlist.js');
-            $this->plugin->api->include_script('libkolab/js/audittrail.js');
-        }
+        $this->plugin->api->include_script('libkolab/libkolab.js');
     }
 
     /**
@@ -177,7 +168,11 @@ class tasklist_ui
     {
         $tree = true;
         $jsenv = array();
-        $lists = $this->plugin->driver->get_lists($tree);
+        $lists = $this->plugin->driver->get_lists(0, $tree);
+
+        if (empty($attrib['id'])) {
+            $attrib['id'] = 'rcmtasklistslist';
+        }
 
         // walk folder tree
         if (is_object($tree)) {
@@ -201,6 +196,9 @@ class tasklist_ui
             }
         }
 
+        $this->rc->output->include_script('treelist.js');
+
+        $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
         $this->rc->output->set_env('tasklists', $jsenv);
         $this->register_gui_object('tasklistslist', $attrib['id']);
 
@@ -255,8 +253,8 @@ class tasklist_ui
         }
 
         $classes = array('tasklist');
-        $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
-          html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
+        $title   = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
+            html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
 
         if ($prop['virtual'])
             $classes[] = 'virtual';
@@ -269,15 +267,22 @@ class tasklist_ui
 
         if (!$activeonly || $prop['active']) {
             $label_id = 'tl:' . $id;
+            $chbox = html::tag('input', array(
+                    'type'    => 'checkbox',
+                    'name'    => '_list[]',
+                    'value'   => $id,
+                    'checked' => $prop['active'],
+                    'title'   => $this->plugin->gettext('activate'),
+                    'aria-labelledby' => $label_id
+            ));
+
             return html::div(join(' ', $classes),
-                html::span(array('class' => 'listname', 'title' => $title, 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
-                  ($prop['virtual'] ? '' :
-                      html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id)) .
-                      html::span('actions', 
-                          ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '') .
-                          html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ') .
-                          (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
-                      )
+                html::a(array('class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
+                    ($prop['virtual'] ? '' : $chbox . html::span('actions',
+                          ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '')
+                          . html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ')
+                          . (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
+                    )
                 )
             );
         }
@@ -306,11 +311,18 @@ class tasklist_ui
      */
     function tasklist_select($attrib = array())
     {
-        $attrib['name']       = 'list';
+        if (empty($attrib['name'])) {
+            $attrib['name'] = 'list';
+        }
+
         $attrib['is_escaped'] = true;
         $select = new html_select($attrib);
         $default = null;
 
+        foreach ((array) $attrib['extra'] as $id => $name) {
+            $select->add($name, $id);
+        }
+
         foreach ((array)$this->plugin->driver->get_lists() as $id => $prop) {
             if ($prop['editable'] || strpos($prop['rights'], 'i') !== false) {
                 $select->add($prop['name'], $id);
@@ -322,31 +334,40 @@ class tasklist_ui
         return $select->show($default);
     }
 
-
     function tasklist_editform($action, $list = array())
+    {
+        $this->action = $action;
+        $this->list   = $list;
+
+        $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabeltasklistform'));
+        $this->rc->output->add_handler('folderform', array($this, 'tasklistform'));
+        $this->rc->output->send('libkolab.folderform');
+    }
+
+    function tasklistform($attrib)
     {
         $fields = array(
             'name' => array(
-                'id' => 'taskedit-tasklistame',
+                'id'    => 'taskedit-tasklistname',
                 'label' => $this->plugin->gettext('listname'),
-                'value' => html::tag('input', array('id' => 'taskedit-tasklistame', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40)),
+                'value' => html::tag('input', array('id' => 'taskedit-tasklistname', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40)),
             ),
 /*
             'color' => array(
-                'id' => 'taskedit-color',
+                'id'    => 'taskedit-color',
                 'label' => $this->plugin->gettext('color'),
                 'value' => html::tag('input', array('id' => 'taskedit-color', 'name' => 'color', 'type' => 'text', 'class' => 'text colorpicker', 'size' => 6)),
             ),
 */
             'showalarms' => array(
-                'id' => 'taskedit-showalarms',
+                'id'    => 'taskedit-showalarms',
                 'label' => $this->plugin->gettext('showalarms'),
                 'value' => html::tag('input', array('id' => 'taskedit-showalarms', 'name' => 'color', 'type' => 'checkbox')),
             ),
         );
 
-        return html::tag('form', array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
-            $this->plugin->driver->tasklist_edit_form($action, $list, $fields)
+        return html::tag('form', $attrib + array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
+            $this->plugin->driver->tasklist_edit_form($this->action, $this->list, $fields)
         );
     }
 
@@ -368,7 +389,12 @@ class tasklist_ui
 
         $label = html::label(array('for' => 'quickaddinput', 'class' => 'voice'), $this->plugin->gettext('quickaddinput'));
         $input = new html_inputfield(array('name' => 'text', 'id' => 'quickaddinput'));
-        $button = html::tag('input', array('type' => 'submit', 'value' => '+', 'title' => $this->plugin->gettext('createtask'), 'class' => 'button mainaction'));
+        $button = html::tag('input', array(
+                'type'  => 'submit',
+                'value' => '+',
+                'title' => $this->plugin->gettext('createtask'),
+                'class' => 'button mainaction'
+        ));
 
         $this->register_gui_object('quickaddform', $attrib['id']);
         return html::tag('form', $attrib, $label . $input->show() . $button);
@@ -387,18 +413,6 @@ class tasklist_ui
         return html::tag('ul', $attrib, '');
     }
 
-    /**
-     * Container for a tags cloud
-     */
-    function tagslist($attrib)
-    {
-        $attrib += array('id' => 'rcmtasktagslist');
-        unset($attrib['name']);
-
-        $this->register_gui_object('tagslist', $attrib['id']);
-        return html::tag('ul', $attrib, '');
-    }
-
     /**
      * Interactive UI element to add/remove tags
      */
@@ -412,58 +426,6 @@ class tasklist_ui
         return html::div($attrib, $input->show(''));
     }
 
-    /**
-     * Generate HTML element for attachments list
-     */
-    function attachments_list($attrib = array())
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmtaskattachmentlist';
-
-        $this->register_gui_object('attachmentlist', $attrib['id']);
-
-        return html::tag('ul', $attrib, '', html::$common_attrib);
-    }
-
-    /**
-     * Generate the form for event attachments upload
-     */
-    function attachments_form($attrib = array())
-    {
-        // add ID if not given
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmtaskuploadform';
-
-        // Get max filesize, enable upload progress bar
-        $max_filesize = $this->rc->upload_init();
-
-        $button = new html_inputfield(array('type' => 'button'));
-        $input = new html_inputfield(array(
-            'type' => 'file',
-            'name' => '_attachments[]',
-            'multiple' => 'multiple',
-            'size' => $attrib['attachmentfieldsize'],
-        ));
-
-        return html::div($attrib,
-            html::div(null, $input->show()) .
-            html::div('buttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
-                'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
-            html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
-        );
-    }
-
-    /**
-     * Register UI object for HTML5 drag & drop file upload
-     */
-    function file_drop_area($attrib = array())
-    {
-        if ($attrib['id']) {
-            $this->register_gui_object('filedrop', $attrib['id']);
-            $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
-        }
-    }
-
     /**
      *
      */
@@ -480,7 +442,7 @@ class tasklist_ui
         $table->add_header('confirmstate', $this->plugin->gettext('confirmstate'));
         if ($invitations) {
             $table->add_header(array('class' => 'invite', 'title' => $this->plugin->gettext('sendinvitations')),
-                $invite->show(1) . html::label('edit-attendees-invite', $this->plugin->gettext('sendinvitations')));
+                $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->plugin->gettext('sendinvitations'))));
         }
         $table->add_header('options', '');
 
@@ -499,16 +461,16 @@ class tasklist_ui
      */
     function attendees_form($attrib = array())
     {
-        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
+        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => $attrib['size'], 'class' => 'form-control'));
         $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
-            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('itipcommenttitle')));
+            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('itipcommenttitle'), 'class' => 'form-control'));
 
         return html::div($attrib,
-            html::div(null, $input->show() . " " .
+            html::div('form-searchbar', $input->show() . " " .
                 html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->plugin->gettext('addattendee')))
                 // . " " . html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->plugin->gettext('scheduletime').'...'))
                 ) .
-            html::p('attendees-commentbox', html::label(null, $this->plugin->gettext('itipcomment') . $textarea->show()))
+            html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->plugin->gettext('itipcomment')) . $textarea->show())
         );
     }
 
@@ -517,10 +479,92 @@ class tasklist_ui
      */
     function edit_attendees_notify($attrib = array())
     {
-        $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
+        $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox'));
         return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications')));
     }
 
+    /**
+     * Form for uploading and importing tasks
+     */
+    function tasks_import_form($attrib = array())
+    {
+        if (!$attrib['id']) {
+            $attrib['id'] = 'rcmImportForm';
+        }
+
+        // Get max filesize, enable upload progress bar
+        $max_filesize = $this->rc->upload_init();
+        $accept       = '.ics, text/calendar, text/x-vcalendar, application/ics';
+        if (class_exists('ZipArchive', false)) {
+            $accept .= ', .zip, application/zip';
+        }
+
+        $input = new html_inputfield(array(
+                'type'   => 'file',
+                'name'   => '_data',
+                'size'   => $attrib['uploadfieldsize'],
+                'accept' => $accept
+        ));
+
+        $html = html::div('form-section form-group row',
+            html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
+            . html::div('col-sm-8', $input->show()
+                . html::div('hint', $this->rc->gettext(array('id' => 'importfile', 'name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
+        );
+
+        $html .= html::div('form-section form-group row',
+            html::label(array('for' => 'task-import-list', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('list'))
+            . html::div('col-sm-8', $this->tasklist_select(array('name' => 'source', 'id' => 'task-import-list', 'editable' => true)))
+        );
+
+        $this->rc->output->add_gui_object('importform', $attrib['id']);
+        $this->rc->output->add_label('import', 'importerror');
+
+        return html::tag('p', null, $this->plugin->gettext('importtext'))
+            .html::tag('form', array(
+                'action'  => $this->rc->url(array('task' => 'tasklist', 'action' => 'import')),
+                'method'  => 'post',
+                'enctype' => 'multipart/form-data',
+                'id'      => $attrib['id'],
+            ),
+            $html
+        );
+    }
+
+    /**
+     * Form to select options for exporting tasks
+     */
+    function tasks_export_form($attrib = array())
+    {
+        if (!$attrib['id']) {
+            $attrib['id'] = 'rcmTaskExportForm';
+        }
+
+        $html .= html::div('form-section form-group row',
+            html::label(array('for' => 'task-export-list', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('list'))
+            . html::div('col-sm-8', $this->tasklist_select(array(
+                        'name'  => 'source',
+                        'id'    => 'task-export-list',
+                        'extra' => array('' => '- ' . $this->plugin->gettext('currentview') . ' -'),
+                )))
+        );
+
+        $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'task-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox'));
+        $html .= html::div('form-section form-group row form-check',
+            html::label(array('for' => 'task-export-attachments', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('exportattachments'))
+            . html::div('col-sm-8', $checkbox->show(1))
+        );
+
+        $this->register_gui_object('exportform', $attrib['id']);
+
+        return html::tag('form', array(
+                'action' => $this->rc->url(array('task' => 'tasklist', 'action' => 'export')),
+                'method' => 'post', 'id' => $attrib['id']
+            ),
+            $html
+        );
+    }
+
     /**
      * Wrapper for rcube_output_html::add_gui_object()
      */
diff --git a/plugins/tinymce_config/composer.json b/plugins/tinymce_config/composer.json
index cb136469..41a7b367 100644
--- a/plugins/tinymce_config/composer.json
+++ b/plugins/tinymce_config/composer.json
@@ -4,7 +4,7 @@
     "description": "TinyMCE Editor Configurator",
     "homepage": "https://git.kolab.org/diffusion/RPK/",
     "license": "AGPLv3",
-    "version": "1.0.0",
+    "version": "3.4.0",
     "authors": [
         {
             "name": "Aleksander Machniak",
diff --git a/plugins/wap_client/composer.json b/plugins/wap_client/composer.json
new file mode 100644
index 00000000..3d4a0453
--- /dev/null
+++ b/plugins/wap_client/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "kolab/wap_client",
+    "type": "roundcube-plugin",
+    "description": "Kolab Web Admin Client",
+    "homepage": "https://git.kolab.org/diffusion/RPK/",
+    "license": "AGPLv3",
+    "version": "3.4.0",
+    "authors": [
+        {
+            "name": "Aleksander Machniak",
+            "email": "machniak@kolabsys.com",
+            "role": "Lead"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3",
+        "kolab/libkolab": ">=3.4.0"
+    }
+}
diff --git a/plugins/wap_client/config.inc.php.dist b/plugins/wap_client/config.inc.php.dist
new file mode 100644
index 00000000..7ce30c1e
--- /dev/null
+++ b/plugins/wap_client/config.inc.php.dist
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Kolab WAP Client plugin configuration
+ *
+ * Copyright (C) 2016, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Kolab WAP API URL
+$config['wap_client_uri'] = '/kolab-webadmin/api';
+
+// Log conversation with WAP
+$config['wap_client_debug'] = false;
+
+// Domain root DN
+$config['wap_client_root_dn'] = 'dc=example,dc=org';
+
+// Domain base DN
+$config['wap_client_base_dn'] = 'dc=example,dc=org';
+
+// Accounts definition
+$config['wap_client_accounts'] = array();
+/*
+$config['wap_client_accounts'] = array(
+    'Lite' => array(
+        'description' => 'Mail account with 2GB quota',
+        'nsroledn'    => array('cn=imap-user,$base_dn', 'cn=active-user,$root_dn'),
+        'mailquota'   => 2097152,
+    ),
+    'Professional' => array(
+        'description' => 'Professional groupware account with 10GB quota',
+        'nsroledn'    => array('cn=activesync-user,$base_dn', 'cn=kolab-user,$base_dn', 'cn=active-user,$root_dn'),
+        'mailquota'   => 10485760,
+    ),
+);
+*/
diff --git a/plugins/wap_client/localization/en_US.inc b/plugins/wap_client/localization/en_US.inc
new file mode 100644
index 00000000..5400e2ae
--- /dev/null
+++ b/plugins/wap_client/localization/en_US.inc
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Localizations for the WPA Clien plugin
+ *
+ * Copyright (C) 2016, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/wpa_client/
+ */
+
+$labels['accountoptions'] = 'Account options';
+$labels['accounttype'] = 'Account type';
+$labels['failedtypedetection'] = 'Failed to retrieve account type.';
+$labels['failedtypeupdate'] = 'Failed to change account type.';
diff --git a/plugins/wap_client/wap_client.php b/plugins/wap_client/wap_client.php
new file mode 100644
index 00000000..70bd08e4
--- /dev/null
+++ b/plugins/wap_client/wap_client.php
@@ -0,0 +1,340 @@
+<?php
+
+/**
+ * WAP Client plugin.
+ *
+ * @version @package_version@
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2016, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class wap_client extends rcube_plugin
+{
+    public $task   = 'settings';
+    public $noajax = true;
+
+    protected $rc;
+    protected $wap;
+    protected $userinfo;
+    protected $token;
+
+
+    /**
+     * Initializes the plugin
+     */
+    function init()
+    {
+        $this->rc = rcmail::get_instance();
+
+        $this->add_hook('preferences_list', array($this, 'prefs_table'));
+        $this->add_hook('preferences_save', array($this, 'save_prefs'));
+    }
+
+    /**
+     * Hook to inject plugin-specific user settings
+     */
+    public function prefs_table($args)
+    {
+        global $CURR_SECTION;
+
+        if ($args['section'] != 'server') {
+            return;
+        }
+
+        $this->load_config();
+
+        $accounts = (array) $this->rc->config->get('wap_client_accounts');
+
+        if (empty($accounts)) {
+            return;
+        }
+
+        $this->add_texts('localization');
+
+        if ($CURR_SECTION) {
+            $account_type = $this->get_account_type();
+            $_SESSION['wap_client_account_type'] = $account_type;
+        }
+
+        $input   = new html_radiobutton(array('name' => '_account_type', 'style' => 'display:block; float:left'));
+        $content = '';
+
+        foreach ($accounts as $idx => $def) {
+            $id   = 'account_type_' . strtolower(asciiwords($idx, true));
+            $name = $idx;
+            $name = $this->rc->text_exists('wap_client.account.' . $name) ? $this->gettext('account.' . $name) : $name;
+            $desc = $this->rc->text_exists('wap_client.accountdesc.' . $name) ? $this->gettext('accountdesc.' . $name) : $def['description'];
+
+            $name = html::span(array('style' => 'font-weight: bold'), rcube::Q($name));
+            if ($desc) {
+                $name .= html::br() . html::span(null, rcube::Q($desc));
+            }
+
+            $label_style = 'display:block; margin: 5px 0; padding-left: 30px';
+            $content .= $input->show($account_type, array('value' => $idx, 'id' => $id))
+                . html::label(array('for' => $id, 'style' => $label_style), $name);
+        }
+
+        $conf = array(
+            'account' => array(
+                'name'    => rcube::Q($this->gettext('accountoptions')),
+                'options' => array(
+                    'account_type' => array(
+                        'title'   => $this->gettext('accounttype'),
+                        'content' => $content,
+                    )
+                )
+            )
+        );
+
+        $args['blocks'] = array_merge($conf, $args['blocks']);
+
+        return $args;
+    }
+
+    /**
+     * Hook to save plugin-specific user settings
+     */
+    public function save_prefs($args)
+    {
+        if ($args['section'] != 'server') {
+            return;
+        }
+
+        $account_type = rcube_utils::get_input_value('_account_type', rcube_utils::INPUT_POST);
+
+        if (!$account_type || $account_type == $_SESSION['wap_client_account_type']) {
+            return;
+        }
+
+        $this->add_texts('localization');
+
+        $this->set_account_type($account_type);
+    }
+
+    /**
+     * Get current account type (from WAP)
+     */
+    protected function get_account_type()
+    {
+        $this->init_wap();
+
+        if (empty($this->userinfo)) {
+            $this->rc->output->show_message($this->gettext('failedtypedetection'), 'warning');
+            return;
+        }
+
+        $roles    = (array) $this->userinfo['nsroledn'];
+        $accounts = (array) $this->rc->config->get('wap_client_accounts');
+        $root_dn  = $this->rc->config->get('wap_client_root_dn');
+        $base_dn  = $this->rc->config->get('wap_client_base_dn');
+
+        foreach ($accounts as $name => $account) {
+            foreach ((array) $account['nsroledn'] as $role) {
+                $value = str_replace('$base_dn', $base_dn, $value);
+                $value = str_replace('$root_dn', $root_dn, $value);
+
+                if (!in_array($value, $roles)) {
+                    continue 2;
+                }
+            }
+
+            return $name;
+        }
+    }
+
+    /**
+     * Set account type (in WAP)
+     */
+    protected function set_account_type($type)
+    {
+        if (!$this->init_wap()) {
+            return false;
+        }
+
+        $query    = $this->userinfo;
+        $accounts = (array) $this->rc->config->get('wap_client_accounts');
+        $root_dn  = $this->rc->config->get('wap_client_root_dn');
+        $base_dn  = $this->rc->config->get('wap_client_base_dn');
+        $account  = $accounts[$type];
+
+        if (empty($account)) {
+            $this->rc->output->show_message($this->gettext('failedtypeupdate'), 'warning');
+            return;
+        }
+
+        unset($account['description']);
+
+        foreach ($account as $attr => $value) {
+            switch ($attr) {
+            case 'nsroledn':
+                $value = array();
+                foreach ((array) $account['nsroledn'] as $role) {
+                    $role = str_replace('$base_dn', $base_dn, $role);
+                    $role = str_replace('$root_dn', $root_dn, $role);
+                    $value[] = $role;
+                }
+
+            default:
+                $query[$attr] = $value;
+            }
+        }
+
+        $response = $this->post('user.edit', $query);
+
+        if (!$response || $response['status'] != 'OK') {
+            $this->rc->output->show_message($this->gettext('failedtypeupdate'), 'warning');
+            return;
+        }
+
+        $this->userinfo = $query;
+    }
+
+    /**
+     * Initialize WAP connection and user session
+     */
+    protected function init_wap()
+    {
+        if ($this->wap) {
+            return $this->wap;
+        }
+
+        $this->load_config();
+        $this->require_plugin('libkolab');
+
+        $uri  = $this->rc->config->get('wap_client_uri');
+        $user = $this->rc->get_user_name();
+        $pass = $this->rc->decrypt($_SESSION['password']);
+
+        if (!$uri) {
+            rcube::raise_error("wap_client_uri is not set", true, false);
+            return;
+        }
+
+        // get HTTP_Request2 object
+        $this->uri = rcube_utils::resolve_url($uri);
+        $this->wap = libkolab::http_request($this->uri);
+
+        $query = array(
+            'username' => $user,
+            'password' => $pass,
+        //    'domain'   => $domain,
+            'info'     => true,
+        );
+
+        // authenticate the user
+        $response = $this->post('system.authenticate', $query);
+
+        if ($response) {
+            $this->userinfo = $response['result']['info'];
+            $this->token    = $response['result']['session_token'];
+        }
+
+        return $this->wap;
+    }
+
+    /**
+     * API's POST request.
+     *
+     * @param string $action Action name
+     * @param array  $post   POST arguments
+     *
+     * @return kolab_client_api_result  Response
+     */
+    protected function post($action, $post = array())
+    {
+        $url = $this->build_url($action);
+
+        if ($this->rc->config->get('wap_client_debug')) {
+            $this->rc->write_log('wap', "Calling API POST: $url\n" . @json_encode($post));
+        }
+
+        if ($this->token) {
+            $this->wap->setHeader('X-Session-Token', $this->token);
+        }
+
+        $this->wap->setMethod(HTTP_Request2::METHOD_POST);
+        $this->wap->setBody(@json_encode($post));
+
+        return $this->get_response($url);
+    }
+
+    /**
+     * Build Net_URL2 object for the request
+     *
+     * @param string $action Action GET parameter
+     * @param array  $args   GET parameters (hash array: name => value)
+     *
+     * @return Net_URL2 URL object
+     */
+    private function build_url($action, $args = array())
+    {
+        $url = rtrim($this->uri, '/');
+
+        if ($action) {
+            $url .= '/' . urlencode($action);
+        }
+
+        $url = new Net_URL2($url);
+
+        if (!empty($args)) {
+            $url->setQueryVariables($args);
+        }
+
+        return $url;
+    }
+
+    /**
+     * HTTP Response handler.
+     *
+     * @param Net_URL2 $url URL object
+     *
+     * @return array Response data
+     */
+    protected function get_response($url)
+    {
+        try {
+            $this->wap->setUrl($url);
+            $response = $this->wap->send();
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, false);
+            return;
+        }
+
+        try {
+            $body = $response->getBody();
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, false);
+            return;
+        }
+
+        if ($this->rc->config->get('wap_client_debug')) {
+            $this->rc->write_log('wap', "Response:\n$body");
+        }
+
+        $body = @json_decode($body, true);
+
+        if (!is_array($body)) {
+            rcube::raise_error("Failed to decode WAP response", true, false);
+            return;
+        }
+
+        return $body;
+    }
+}
diff --git a/source/tasklist_buttons.psd b/source/tasklist_buttons.psd
new file mode 100644
index 00000000..5b1a8977
Binary files /dev/null and b/source/tasklist_buttons.psd differ
diff --git a/source/tasklist_sprites.psd b/source/tasklist_sprites.psd
new file mode 100644
index 00000000..741ad936
Binary files /dev/null and b/source/tasklist_sprites.psd differ