diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index 5c131e1c..12a0211e 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -1,174 +1,182 @@
 <?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'] = 'Files';
 $labels['filepreview'] = 'File preview';
 $labels['saveall'] = 'Save all to cloud...';
 $labels['saveto'] = 'Save to cloud...';
 $labels['saveas'] = 'Save as:';
 $labels['create'] = 'Create';
 $labels['save'] = 'Save';
 $labels['cancel'] = 'Cancel';
 $labels['fromcloud'] = 'From cloud...';
 $labels['selectfiles'] = 'Select file(s) to attach...';
 $labels['attachsel'] = 'Attach selected';
 $labels['foldercreate'] = 'Create folder';
 $labels['folderedit'] = 'Edit folder';
 $labels['foldermount'] = 'Add storage';
 $labels['folderdelete'] = 'Delete folder';
+$labels['folderoptions'] = 'Folder options';
 
 $labels['folderinside'] = 'Insert inside';
 $labels['foldername'] = 'Folder name';
 $labels['name'] = 'Name';
 $labels['mtime'] = 'Modified';
 $labels['type'] = 'Type';
 
 $labels['upload'] = 'Upload';
 $labels['uploadfile'] = 'Upload file(s)';
 $labels['get'] = 'Download';
 $labels['getfile'] = 'Download file';
 $labels['view'] = 'View';
 $labels['viewfile'] = 'View file';
 $labels['rename'] = 'Rename';
 $labels['deletefile'] = 'Delete file(s)';
 $labels['edit'] = 'Edit';
 $labels['editfile'] = 'Edit file';
 $labels['save'] = 'Save';
 $labels['savefile'] = 'Save file';
 $labels['printfile'] = 'Print file';
 $labels['renamefile'] = 'Rename a file';
 $labels['createfile'] = 'Create a file';
 $labels['createandedit'] = 'Create and Edit';
 $labels['copyfile'] = 'Copy a file';
 $labels['copyandedit'] = 'Copy and Edit';
 $labels['documenttitle'] = 'Title:';
 $labels['close'] = 'Close';
+$labels['docedit'] = 'Document editing';
 
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Images';
 $labels['collection_document'] = 'Documents';
 $labels['sessions'] = 'Sessions';
 
 $labels['uploading'] = 'Uploading file(s)...';
 $labels['attaching'] = 'Attaching file(s)...';
 $labels['authenticating'] = 'Authenticating...';
 $labels['foldercreating'] = 'Creating folder...';
 $labels['folderupdating'] = 'Updating folder...';
 $labels['foldermounting'] = 'Adding external storage...';
 $labels['folderdeleting'] = 'Deleting folder...';
 $labels['folderdeleteconfirm'] = 'Are you sure you want to delete selected folder?';
 $labels['folderdeletenotice'] = 'Folder deleted successfully.';
 $labels['folderupdatenotice'] = 'Folder updated successfully.';
 $labels['foldercreatenotice'] = 'Folder created successfully.';
 $labels['foldermountnotice'] = 'Storage added successfully.';
 $labels['folderauthtitle'] = 'Logon to $title';
 $labels['saveallnotice'] = 'Successfully saved $n file(s).';
 $labels['saveallerror'] = 'Saving $n file(s) failed.';
 $labels['attacherror'] = 'Failed to attach file(s) from the cloud';
 $labels['fileupdating'] = 'Updating file...';
 $labels['filecreating'] = 'Creating file...';
 $labels['filemoving'] = 'Moving file(s)...';
 $labels['filecopying'] = 'Copying file(s)...';
 $labels['filedeleting'] = 'Deleting file(s)...';
 $labels['filedeleteconfirm'] = 'Are you sure you want to delete selected files?';
 $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['listpermanent'] = 'List permanently';
 $labels['additionalfolders'] = 'Additional folders';
 $labels['allfolders'] = 'search in all folders';
 $labels['fileskip'] = 'Skip';
 $labels['fileskipall'] = 'Skip all';
 $labels['fileoverwrite'] = 'Overwrite';
 $labels['fileoverwriteall'] = 'Overwrite all';
 $labels['filemoveconfirm'] = 'This action is going to overwrite the destination file: <b>$file</b>.';
 
 $labels['editfiledialog'] = 'Confirm editing action';
 $labels['editfilesessions'] = 'There are ongoing sessions on the selected file. Please, select the action you want to take.';
 $labels['newsession'] = 'Create a new session';
 $labels['newsessionro'] = 'Create a new session (copy the file into read-write location)';
 $labels['ownedsession'] = 'Continue your existing session';
 $labels['invitedsession'] = 'Join the session of $user';
 $labels['joinsession'] = 'Request an invitation from $user';
 $labels['editfilero'] = 'This file is read-only. Do you want to create and edit a copy of the file?';
 $labels['editfilerotitle'] = 'Read-only file';
 $labels['select'] = 'Select';
 $labels['terminatesession'] = 'Terminate the session';
 $labels['sessionterminatedtitle'] = 'Session terminated';
 $labels['sessionterminated'] = 'The session has been terminated. The window will be closed.';
 $labels['terminate'] = 'Terminate';
 $labels['sessionterminating'] = 'Terminating the session...';
 $labels['unsavedchanges'] = 'There are unsaved changes in the document that will be lost. Do you want to terminate the session anyway?';
 $labels['manageeditors'] = 'Invite to document';
 $labels['participant'] = 'Participant';
 $labels['status'] = 'Status';
 $labels['addparticipant'] = 'Add participant';
 $labels['delparticipant'] = 'Remove participant';
 $labels['invitationtexttitle'] = 'This comment will be attached to the invitation/notification message sent to the participant';
 $labels['invitationtextlabel'] = 'Invitation/notification comment';
 $labels['statusorganizer'] = 'Organizer';
 $labels['statusinvited'] = 'Invited';
 $labels['statusaccepted'] = 'Accepted';
 $labels['statusdeclined'] = 'Declined';
 $labels['statusrequested'] = 'Requested';
 $labels['documentinviting'] = 'Inviting participant(s)...';
 $labels['documentcancelling'] = 'Removing participant(s)...';
 $labels['removeparticipant'] = 'Remove';
 $labels['invitednotice'] = 'You have been invited to the editing session by $owner.';
 $labels['acceptedownernotice'] = '$owner accepted your request to join the editing session.';
 $labels['declinedownernotice'] = '$owner declined your request to join the editing session.';
 $labels['acceptednotice'] = '$user accepted your invitation to the editing session.';
 $labels['declinednotice'] = '$user declined your invitation to the editing session.';
 $labels['requestednotice'] = '$user requested to join the editing session.';
 $labels['sessiondialog'] = 'Document editing session';
 $labels['sessiondialogcontent'] = 'There is ongoing editing session on $file created by $owner.';
 $labels['more'] = 'More.';
 $labels['accept'] = 'Accept';
 $labels['join'] = 'Join the session';
 $labels['decline'] = 'Decline';
 $labels['owner'] = 'Owner';
 $labels['when'] = 'When';
 $labels['file'] = 'File';
 $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['arialabelsearchform'] = 'Files search form';
 $labels['arialabelquicksearchbox'] = 'Search input';
 $labels['arialabellistoptions'] = 'Files list options';
 $labels['arialabelfolderoptions'] = 'Folder actions';
 $labels['arialabelfileeditform'] = 'File editing form';
 $labels['arialabelfilecreateform'] = 'File creation form';
 $labels['arialabelfilelist'] = 'List of files';
 $labels['arialabelfoldercreateform'] = 'Folder creation form';
 $labels['arialabelfoldereditform'] = 'Folder editing form';
 $labels['arialabelfoldermountform'] = 'External storage form';
 $labels['arialabelfolderauthform'] = 'External storage authentication form';
 $labels['arialabelfolderlist'] = 'Folder/Collection selection';
 $labels['arialabelfileselectdialog'] = 'File selection dialog';
 $labels['arialabelattachmentoptions'] = 'Attachment save options';
 $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['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['type.plain'] = 'Plain Text Document';
 $labels['type.vndoasisopendocumenttext'] = 'Text Document (ODF)';
 $labels['type.html'] = 'HTML Document';
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
@@ -1,36 +1,38 @@
 <?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 = array();
 
 $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';
 $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/libcalendaring/localization/en_US.inc b/plugins/libcalendaring/localization/en_US.inc
index bbdcc2bd..8dfd340a 100644
--- a/plugins/libcalendaring/localization/en_US.inc
+++ b/plugins/libcalendaring/localization/en_US.inc
@@ -1,186 +1,188 @@
 <?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 = array();
 
 // words for spoken dates
 $labels['until'] = 'until';
 $labels['at'] = 'at';
 
 // alarms related labels
 $labels['alarmemail'] = 'Send Email';
 $labels['alarmdisplay'] = 'Show message';
 $labels['alarmaudio'] = 'Play sound';
 $labels['alarmdisplayoption'] = 'Message';
 $labels['alarmemailoption'] = 'Email';
 $labels['alarmaudiooption'] = 'Sound';
 $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['triggerend-M'] = 'minutes before end';
 $labels['triggerend-H'] = 'hours before end';
 $labels['triggerend-D'] = 'days before end';
 $labels['triggerend+M'] = 'minutes after end';
 $labels['triggerend+H'] = 'hours after end';
 $labels['triggerend+D'] = 'days after end';
 $labels['trigger0'] = 'on time';
 $labels['triggerattime'] = 'at start time';
 $labels['triggerattimeend'] = 'at end time';
 $labels['relatedstart'] = 'start';
 $labels['relatedendevent'] = 'end';
 $labels['relatedendtask'] = 'due time';
 $labels['addalarm'] = 'Add alarm';
 $labels['removealarm'] = 'Remove alarm';
 
 $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...';
 
 // recurrence related labels
 $labels['recurring'] = 'Repeats';
 $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['years'] = 'year(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['untilenddate'] = 'until date';
 $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['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';
 $labels['itipcancellation'] = 'Cancelled:';
 $labels['itipreply'] = 'Reply to';
 $labels['itipaccepted'] = 'Accept';
 $labels['itiptentative'] = 'Maybe';
 $labels['itipdeclined'] = 'Decline';
 $labels['itipdelegated'] = 'Delegate';
 $labels['itipneeds-action'] = 'Postpone';
 $labels['itipcomment'] = 'Your response';
 $labels['itipeditresponse'] = 'Enter a response text';
 $labels['itipsendercomment'] = 'Sender\'s comment: ';
 $labels['itipsuppressreply'] = 'Do not send a response';
 
 $labels['itipobjectnotfound'] = 'The object referred by this message was not found in your account.';
 $labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
 $labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
 $labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
 $labels['itipsubjectin-process'] = '"$title" is in-process by $name';
 $labels['itipsubjectcompleted'] = '"$title" was completed by $name';
 $labels['itipsubjectcancel'] = 'Your participation in "$title" has been cancelled';
 $labels['itipsubjectdelegated'] = '"$title" has been delegated by $name';
 $labels['itipsubjectdelegatedto'] = '"$title" has been delegated to you by $name';
 
 $labels['itipnewattendee'] = 'This is a reply from a new participant';
 $labels['updateattendeestatus'] = 'Update the participant\'s status';
 $labels['acceptinvitation'] = 'Do you accept this invitation?';
 $labels['acceptattendee'] = 'Accept participant';
 $labels['declineattendee'] = 'Decline participant';
 $labels['declineattendeeconfirm'] = 'Enter a message to the declined participant (optional):';
 $labels['rsvpmodeall'] = 'The entire series';
 $labels['rsvpmodecurrent'] = 'This occurrence only';
 $labels['rsvpmodefuture'] = 'This and future occurrences';
 
 $labels['itipsingleoccurrence'] = 'This is a <em>single occurrence</em> out of a series of events';
 $labels['itipfutureoccurrence'] = 'Refers to <em>this and all future occurrences</em> of a series of events';
 $labels['itipmessagesingleoccurrence'] = 'The message only refers to this single occurrence';
 $labels['itipmessagefutureoccurrence'] = 'The message refers to this and all future occurrences';
 
 $labels['youhaveaccepted'] = 'You have accepted this invitation';
 $labels['youhavetentative'] = 'You have tentatively accepted this invitation';
 $labels['youhavedeclined'] = 'You have declined this invitation';
 $labels['youhavedelegated'] = 'You have delegated this invitation';
 $labels['youhavein-process'] = 'You are working on this assignment';
 $labels['youhavecompleted'] = 'You have completed this assignment';
 $labels['youhaveneeds-action'] = 'Your response to this invitation is still pending';
 
 $labels['youhavepreviouslyaccepted'] = 'You have previously accepted this invitation';
 $labels['youhavepreviouslytentative'] = 'You have previously accepted this invitation tentatively';
 $labels['youhavepreviouslydeclined'] = 'You have previously declined this invitation';
 $labels['youhavepreviouslydelegated'] = 'You have previously delegated this invitation';
 $labels['youhavepreviouslyin-process'] = 'You have previously reported to work on this assignment';
 $labels['youhavepreviouslycompleted'] = 'You have previously completed this assignment';
 $labels['youhavepreviouslyneeds-action'] = 'Your response to this invitation is still pending';
 
 $labels['attendeeaccepted'] = 'Participant has accepted';
 $labels['attendeetentative'] = 'Participant has tentatively accepted';
 $labels['attendeedeclined'] = 'Participant has declined';
 $labels['attendeedelegated'] = 'Participant has delegated to $delegatedto';
 $labels['attendeein-process'] = 'Participant is in-process';
 $labels['attendeecompleted'] = 'Participant has completed';
 $labels['notanattendee'] = 'You\'re not listed as an attendee of this object';
 $labels['outdatedinvitation'] = 'This invitation has been replaced by a newer version';
 
 $labels['importtocalendar'] = 'Save to my calendar';
 $labels['removefromcalendar'] = 'Remove from my calendar';
 $labels['updatemycopy'] = 'Update my copy';
 $labels['openpreview'] = 'Open Preview';
 
 $labels['deleteobjectconfirm'] = 'Do you really want to delete this object?';
 $labels['declinedeleteconfirm'] = 'Do you also want to delete this declined object from your account?';
 
 $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...';
 
 // attendees labels
 $labels['expandattendeegroup'] = 'Substitute with group members';
 $labels['expandattendeegroupnodata'] = 'Unable to substitute this group. No members found.';
 $labels['expandattendeegrouperror'] = 'Unable to substitute this group. It might contain too many members.';
 $labels['expandattendeegroupsizelimit'] = 'This group contains too many members for substituting.';